From 1907599bfd817e00c7f42b8cb941ebf93a098e7f Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 29 Sep 2020 11:48:04 +0300 Subject: 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 --- src/plugins/platforms/android/androidcontentfileengine.cpp | 12 ++++++------ src/plugins/platforms/android/androidjniaccessibility.cpp | 2 +- src/plugins/platforms/android/androidjnimain.cpp | 2 +- src/plugins/platforms/android/qandroidinputcontext.cpp | 6 +++--- .../platforms/android/qandroidplatformdialoghelpers.cpp | 4 ++-- .../platforms/android/qandroidplatformfiledialoghelper.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp index e552b8fa86..bdbf2186ba 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("org/qtproject/qt5/android/QtNative", + const auto fd = QJNIObjectPrivate::callStaticMethod("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( - "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( - "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( - "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( - "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(), diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp index a27c200362..4d263831e1 100644 --- a/src/plugins/platforms/android/androidjniaccessibility.cpp +++ b/src/plugins/platforms/android/androidjniaccessibility.cpp @@ -318,7 +318,7 @@ if (!clazz) { \ bool registerNatives(JNIEnv *env) { jclass clazz; - FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/accessibility/QtNativeAccessibility"); + FIND_AND_CHECK_CLASS("org/qtproject/qt/android/accessibility/QtNativeAccessibility"); jclass appClass = static_cast(env->NewGlobalRef(clazz)); if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index f920942fd0..9e2cb228b3 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -806,7 +806,7 @@ if (!VAR) { \ static int registerNatives(JNIEnv *env) { jclass clazz; - FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/QtNative"); + FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNative"); m_applicationClass = static_cast(env->NewGlobalRef(clazz)); if (env->RegisterNatives(m_applicationClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp index 84745f3f28..5add7b0746 100644 --- a/src/plugins/platforms/android/qandroidinputcontext.cpp +++ b/src/plugins/platforms/android/qandroidinputcontext.cpp @@ -92,8 +92,8 @@ private: } // namespace anonymous static QAndroidInputContext *m_androidInputContext = 0; -static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt5/android/QtNativeInputConnection"; -static char const *const QtExtractedTextClassName = "org/qtproject/qt5/android/QtExtractedText"; +static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt/android/QtNativeInputConnection"; +static char const *const QtExtractedTextClassName = "org/qtproject/qt/android/QtExtractedText"; static jclass m_extractedTextClass = 0; static jmethodID m_classConstructorMethodID = 0; static jfieldID m_partialEndOffsetFieldID = 0; @@ -392,7 +392,7 @@ static JNINativeMethod methods[] = { {"deleteSurroundingText", "(II)Z", (void *)deleteSurroundingText}, {"finishComposingText", "()Z", (void *)finishComposingText}, {"getCursorCapsMode", "(I)I", (void *)getCursorCapsMode}, - {"getExtractedText", "(III)Lorg/qtproject/qt5/android/QtExtractedText;", (void *)getExtractedText}, + {"getExtractedText", "(III)Lorg/qtproject/qt/android/QtExtractedText;", (void *)getExtractedText}, {"getSelectedText", "(I)Ljava/lang/String;", (void *)getSelectedText}, {"getTextAfterCursor", "(II)Ljava/lang/String;", (void *)getTextAfterCursor}, {"getTextBeforeCursor", "(II)Ljava/lang/String;", (void *)getTextBeforeCursor}, diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp index 0297734bc8..9ce63dceec 100644 --- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp +++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE namespace QtAndroidDialogHelpers { static jclass g_messageDialogHelperClass = 0; -static const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt5/android/QtMessageDialogHelper"; +static const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt/android/QtMessageDialogHelper"; QAndroidPlatformMessageDialogHelper::QAndroidPlatformMessageDialogHelper() :m_buttonId(-1) @@ -190,7 +190,7 @@ bool registerNatives(JNIEnv *env) return false; } g_messageDialogHelperClass = static_cast(env->NewGlobalRef(clazz)); - FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/QtNativeDialogHelper"); + FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNativeDialogHelper"); jclass appClass = static_cast(env->NewGlobalRef(clazz)); if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) { diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp index 1b48769385..acfa4542a1 100644 --- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp +++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp @@ -176,7 +176,7 @@ void QAndroidPlatformFileDialogHelper::setMimeTypes() JniIntentClass, "EXTRA_MIME_TYPES", "Ljava/lang/String;"); QJNIObjectPrivate mimeTypesArray = QJNIObjectPrivate::callStaticObjectMethod( - "org/qtproject/qt5/android/QtNative", + "org/qtproject/qt/android/QtNative", "getStringArray", "(Ljava/lang/String;)[Ljava/lang/String;", QJNIObjectPrivate::fromString(mimeTypes.join(",")).object()); -- cgit v1.2.3