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: Ic7ef0d70fc3e3e7db780eff7d70eff64361ae677
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

5 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/tts/android/jar/AndroidManifest.xml b/src/plugins/tts/android/jar/AndroidManifest.xml
index d4c1b88..25e3c3e 100644
--- a/src/plugins/tts/android/jar/AndroidManifest.xml
+++ b/src/plugins/tts/android/jar/AndroidManifest.xml
@@ -2,6 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="1"
     android:versionName="1.0"
-    package="org.qtproject.qt5.android.qspeech">
+    package="org.qtproject.qt.android.qspeech">
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 </manifest>
diff --git a/src/plugins/tts/android/jar/jar.pro b/src/plugins/tts/android/jar/jar.pro
index 01cac5d..c480ef1 100644
--- a/src/plugins/tts/android/jar/jar.pro
+++ b/src/plugins/tts/android/jar/jar.pro
@@ -1,4 +1,4 @@
-TARGET = QtTextToSpeech
+TARGET = Qt$${QT_MAJOR_VERSION}AndroidTextToSpeech
 
 load(qt_build_paths)
 CONFIG += java
@@ -6,7 +6,7 @@ API_VERSION = android-21
 
 DESTDIR = $$MODULE_BASE_OUTDIR/jar
 
-PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/speech
+PATHPREFIX = $$PWD/src/org/qtproject/qt/android/speech
 
 JAVACLASSPATH += $$PWD/src
 JAVASOURCES += $$PATHPREFIX/QtTextToSpeech.java
diff --git a/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java b/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java
index f6f440c..5faf808 100644
--- a/src/plugins/tts/android/jar/src/org/qtproject/qt5/android/speech/QtTextToSpeech.java
+++ b/src/plugins/tts/android/jar/src/org/qtproject/qt/android/speech/QtTextToSpeech.java
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android.speech;
+package org.qtproject.qt.android.speech;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/src/plugins/tts/android/src/qtexttospeech_android.cpp b/src/plugins/tts/android/src/qtexttospeech_android.cpp
index 76d6573..d243f2f 100644
--- a/src/plugins/tts/android/src/qtexttospeech_android.cpp
+++ b/src/plugins/tts/android/src/qtexttospeech_android.cpp
@@ -100,7 +100,7 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
         return JNI_ERR;
 
     JNIEnv *jniEnv = uenv.nativeEnvironment;
-    jclass clazz = jniEnv->FindClass("org/qtproject/qt5/android/speech/QtTextToSpeech");
+    jclass clazz = jniEnv->FindClass("org/qtproject/qt/android/speech/QtTextToSpeech");
 
     static const JNINativeMethod methods[] = {
         {"notifyError", "(J)V", reinterpret_cast<void *>(notifyError)},
@@ -132,7 +132,7 @@ QTextToSpeechEngineAndroid::QTextToSpeechEngineAndroid(const QVariantMap &parame
     const jlong id = reinterpret_cast<jlong>(this);
     m_speech = QJNIObjectPrivate::callStaticObjectMethod(g_qtSpeechClass,
                                                          "open",
-                                                         "(Landroid/content/Context;J)Lorg/qtproject/qt5/android/speech/QtTextToSpeech;",
+                                                         "(Landroid/content/Context;J)Lorg/qtproject/qt/android/speech/QtTextToSpeech;",
                                                          QtAndroidPrivate::context(),
                                                          id);
     (*textToSpeechMap)[id] = this;
diff --git a/src/tts/tts.pro b/src/tts/tts.pro
index 6711267..6eeed2b 100644
--- a/src/tts/tts.pro
+++ b/src/tts/tts.pro
@@ -22,6 +22,6 @@ SOURCES = \
     qvoice.cpp \
 
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtTextToSpeech.jar
+    jar/Qt$${QT_MAJOR_VERSION}AndroidTextToSpeech.jar
 ANDROID_LIB_DEPENDENCIES = \
     plugins/texttospeech/libplugins_texttospeech_qttexttospeech_android.so