QtPositioning: 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
Task-number: QTBUG-90491
Change-Id: I89e9a709cc9379b0359aceabdabd1676a4943ffa
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

7 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/position/android/jar/AndroidManifest.xml b/src/plugins/position/android/jar/AndroidManifest.xml
index 2d066dbb..2e847fd1 100644
--- a/src/plugins/position/android/jar/AndroidManifest.xml
+++ b/src/plugins/position/android/jar/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.qtproject.qt5.android.positioning"
+    package="org.qtproject.qt.android.positioning"
     android:versionCode="1"
     android:versionName="1.0" >
     <supports-screens android:smallScreens="true" android:largeScreens="true" android:anyDensity="true" android:normalScreens="true"/>
diff --git a/src/plugins/position/android/jar/CMakeLists.txt b/src/plugins/position/android/jar/CMakeLists.txt
index db40330d..8eadc79c 100644
--- a/src/plugins/position/android/jar/CMakeLists.txt
+++ b/src/plugins/position/android/jar/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Generated from jar.pro.
 
 set(java_sources
-    src/org/qtproject/qt5/android/positioning/QtPositioning.java
+    src/org/qtproject/qt/android/positioning/QtPositioning.java # special case
 )
 
-qt_internal_add_jar(QtPositioning
+qt_internal_add_jar(Qt${QtLocation_VERSION_MAJOR}AndroidPositioning # special case
     INCLUDE_JARS ${QT_ANDROID_JAR}
     SOURCES ${java_sources}
     OUTPUT_DIR "${QT_BUILD_DIR}/jar"
 )
 
-install_jar(QtPositioning
+install_jar(Qt${QtLocation_VERSION_MAJOR}AndroidPositioning # special case
     DESTINATION jar
     COMPONENT Devel
 )
diff --git a/src/plugins/position/android/jar/jar.pro b/src/plugins/position/android/jar/jar.pro
index 661f172e..fae1f855 100644
--- a/src/plugins/position/android/jar/jar.pro
+++ b/src/plugins/position/android/jar/jar.pro
@@ -1,4 +1,4 @@
-TARGET = QtPositioning
+TARGET = Qt$${QT_MAJOR_VERSION}AndroidPositioning
 
 load(qt_build_paths)
 
@@ -8,7 +8,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/jar
 JAVACLASSPATH += $$PWD/src
 
 JAVASOURCES += \
-        $$PWD/src/org/qtproject/qt5/android/positioning/QtPositioning.java
+        $$PWD/src/org/qtproject/qt/android/positioning/QtPositioning.java
 
 # install
 target.path = $$[QT_INSTALL_PREFIX]/jar
diff --git a/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java b/src/plugins/position/android/jar/src/org/qtproject/qt/android/positioning/QtPositioning.java
index d819e627..b9a39807 100644
--- a/src/plugins/position/android/jar/src/org/qtproject/qt5/android/positioning/QtPositioning.java
+++ b/src/plugins/position/android/jar/src/org/qtproject/qt/android/positioning/QtPositioning.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android.positioning;
+package org.qtproject.qt.android.positioning;
 
 import android.content.Context;
 import android.location.GpsSatellite;
diff --git a/src/plugins/position/android/src/jnipositioning.cpp b/src/plugins/position/android/src/jnipositioning.cpp
index 05b25d98..ac349fe6 100644
--- a/src/plugins/position/android/src/jnipositioning.cpp
+++ b/src/plugins/position/android/src/jnipositioning.cpp
@@ -587,7 +587,7 @@ static JNINativeMethod methods[] = {
 static bool registerNatives(JNIEnv *env)
 {
     jclass clazz;
-    FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/positioning/QtPositioning");
+    FIND_AND_CHECK_CLASS("org/qtproject/qt/android/positioning/QtPositioning");
     positioningClass = static_cast<jclass>(env->NewGlobalRef(clazz));
 
     if (env->RegisterNatives(positioningClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
diff --git a/src/positioning/CMakeLists.txt b/src/positioning/CMakeLists.txt
index 13aeef8f..5dfe2d58 100644
--- a/src/positioning/CMakeLists.txt
+++ b/src/positioning/CMakeLists.txt
@@ -47,7 +47,7 @@ qt_add_module(Positioning
 
 if(ANDROID)
     set_property(TARGET Positioning APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
-        jar/QtPositioning.jar:org.qtproject.qt5.android.positioning.QtPositioning
+        jar/Qt${QtLocation_VERSION_MAJOR}AndroidPositioning.jar:org.qtproject.qt.android.positioning.QtPositioning # special case
     )
     set_property(TARGET Positioning APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
         plugins/position/libplugins_position_qtposition_android.so
diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro
index db499212..cf4e01c6 100644
--- a/src/positioning/positioning.pro
+++ b/src/positioning/positioning.pro
@@ -10,7 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtpositioning.qdocconf
 OTHER_FILES += configure.json doc/src/*.qdoc doc/src/plugins/*.qdoc   # show .qdoc files in Qt Creator
 
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtPositioning.jar:org.qtproject.qt5.android.positioning.QtPositioning
+    jar/Qt$${QT_MAJOR_VERSION}AndroidPositioning.jar:org.qtproject.qt.android.positioning.QtPositioning
 ANDROID_PERMISSIONS += \
     android.permission.ACCESS_FINE_LOCATION
 ANDROID_FEATURES += \