diff options
| author | Assam Boudjelthia <[email protected]> | 2020-09-29 11:48:04 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <[email protected]> | 2020-10-03 11:22:35 +0300 |
| commit | 1907599bfd817e00c7f42b8cb941ebf93a098e7f (patch) | |
| tree | 643210622dc9ef0c218210453d7f8bd98aa60599 /src/plugins/platforms/android/androidcontentfileengine.cpp | |
| parent | 4e675cb85e81b67f36473914f5822dd6e626ddf0 (diff) | |
Android: rename Android's package name for Qt 6
Rename Android package name org.qtproject.qt5.android to
org.qtproject.qt.android to avoid inconsistency with Qt 6 name.
Also, we include the major version number in the jar target.
Task-number: QTBUG-86969
Change-Id: Ibb68947289be1079911b34ea157bf089cc52c47f
Reviewed-by: Alexandru Croitor <[email protected]>
Diffstat (limited to 'src/plugins/platforms/android/androidcontentfileengine.cpp')
| -rw-r--r-- | src/plugins/platforms/android/androidcontentfileengine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp index e552b8fa866..bdbf2186baa 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.cpp +++ b/src/plugins/platforms/android/androidcontentfileengine.cpp @@ -65,7 +65,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode) openModeStr += QLatin1Char('a'); } - const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/QtNative", + const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/QtNative", "openFdForContentUrl", "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I", QtAndroidPrivate::context(), @@ -82,7 +82,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode) qint64 AndroidContentFileEngine::size() const { const jlong size = QJNIObjectPrivate::callStaticMethod<jlong>( - "org/qtproject/qt5/android/QtNative", "getSize", + "org/qtproject/qt/android/QtNative", "getSize", "(Landroid/content/Context;Ljava/lang/String;)J", QtAndroidPrivate::context(), QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); return (qint64)size; @@ -93,12 +93,12 @@ AndroidContentFileEngine::FileFlags AndroidContentFileEngine::fileFlags(FileFlag FileFlags commonFlags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag); FileFlags flags; const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>( - "org/qtproject/qt5/android/QtNative", "checkIfDir", + "org/qtproject/qt/android/QtNative", "checkIfDir", "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); // If it is a directory then we know it exists so there is no reason to explicitly check const bool exists = isDir ? true : QJNIObjectPrivate::callStaticMethod<jboolean>( - "org/qtproject/qt5/android/QtNative", "checkFileExists", + "org/qtproject/qt/android/QtNative", "checkFileExists", "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), QJNIObjectPrivate::fromString(fileName(DefaultName)).object()); if (!exists && !isDir) @@ -176,12 +176,12 @@ bool AndroidContentFileEngineIterator::hasNext() const if (path().isEmpty()) return false; const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>( - "org/qtproject/qt5/android/QtNative", "checkIfDir", + "org/qtproject/qt/android/QtNative", "checkIfDir", "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(), QJNIObjectPrivate::fromString(path()).object()); if (isDir) { - QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/QtNative", + QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/QtNative", "listContentsFromTreeUri", "(Landroid/content/Context;Ljava/lang/String;)[Ljava/lang/String;", QtAndroidPrivate::context(), |