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>

4 files changed, 7 insertions, 7 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;