diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-29 11:48:04 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-03 11:22:35 +0300 |
| commit | 1907599bfd817e00c7f42b8cb941ebf93a098e7f (patch) | |
| tree | 643210622dc9ef0c218210453d7f8bd98aa60599 /src/corelib/kernel | |
| 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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qjnihelpers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index f845eb37ed..835db956ed 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -340,7 +340,7 @@ static void setNativeService(JNIEnv *env, jclass, jobject service) jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) { - jclass jQtNative = env->FindClass("org/qtproject/qt5/android/QtNative"); + jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative"); if (exceptionCheck(env)) return JNI_ERR; @@ -543,7 +543,7 @@ QtAndroidPrivate::PermissionsHash QtAndroidPrivate::requestPermissionsSync(JNIEn QtAndroidPrivate::PermissionsResult QtAndroidPrivate::checkPermission(const QString &permission) { - const auto res = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/QtNative", + const auto res = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/QtNative", "checkSelfPermission", "(Ljava/lang/String;)I", QJNIObjectPrivate::fromString(permission).object()); |