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

9 files changed, 10 insertions, 10 deletions

diff --git a/src/android/android.pro b/src/android/android.pro
index a21ac2d..50f1d6c 100644
--- a/src/android/android.pro
+++ b/src/android/android.pro
@@ -1,11 +1,11 @@
-TARGET = QtPurchasing
+TARGET = Qt$${QT_MAJOR_VERSION}AndroidPurchasing
 
 CONFIG += java
 load(sdk)
 
 DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
 
-PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/purchasing/
+PATHPREFIX = $$PWD/src/org/qtproject/qt/android/purchasing/
 
 !build_pass {
     isEmpty(SDK_ROOT): SDK_ROOT = $$(ANDROID_SDK_ROOT)
@@ -56,5 +56,5 @@ INSTALLS += target
 OTHER_FILES += \
     $$JAVASOURCES \
     $$PWD/src/com/android/vending/billing/qt_attribution.json \
-    $$PWD/src/org/qtproject/qt5/android/purchasing/qt_attribution.json \
+    $$PWD/src/org/qtproject/qt/android/purchasing/qt_attribution.json \
     $$PWD/src/LICENSE-APACHE-2.0.txt
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/Base64.java b/src/android/src/org/qtproject/qt/android/purchasing/Base64.java
index 58f1982..f4c9379 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/Base64.java
+++ b/src/android/src/org/qtproject/qt/android/purchasing/Base64.java
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.qtproject.qt5.android.purchasing;
+package org.qtproject.qt.android.purchasing;
 
 // This code was converted from code at http://iharder.sourceforge.net/base64/
 // Lots of extraneous features were removed.
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/Base64DecoderException.java b/src/android/src/org/qtproject/qt/android/purchasing/Base64DecoderException.java
index 0260bd9..f919c9f 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/Base64DecoderException.java
+++ b/src/android/src/org/qtproject/qt/android/purchasing/Base64DecoderException.java
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.qtproject.qt5.android.purchasing;
+package org.qtproject.qt.android.purchasing;
 
 /**
  * Exception thrown when encountering an invalid Base64 input character.
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt/android/purchasing/QtInAppPurchase.java
index 94bc202..d642e92 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
+++ b/src/android/src/org/qtproject/qt/android/purchasing/QtInAppPurchase.java
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android.purchasing;
+package org.qtproject.qt.android.purchasing;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/Security.java b/src/android/src/org/qtproject/qt/android/purchasing/Security.java
index a48dda0..5ce0ab6 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/Security.java
+++ b/src/android/src/org/qtproject/qt/android/purchasing/Security.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.qtproject.qt5.android.purchasing;
+package org.qtproject.qt.android.purchasing;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/qt_attribution.json b/src/android/src/org/qtproject/qt/android/purchasing/qt_attribution.json
index a8e5c21..a8e5c21 100644
--- a/src/android/src/org/qtproject/qt5/android/purchasing/qt_attribution.json
+++ b/src/android/src/org/qtproject/qt/android/purchasing/qt_attribution.json
diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
index aab454c..9445b57 100644
--- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
@@ -51,7 +51,7 @@ QAndroidInAppPurchaseBackend::QAndroidInAppPurchaseBackend(QObject *parent)
     qDebug("Creating backend");
 #endif
 
-    m_javaObject = QAndroidJniObject("org/qtproject/qt5/android/purchasing/QtInAppPurchase",
+    m_javaObject = QAndroidJniObject("org/qtproject/qt/android/purchasing/QtInAppPurchase",
                                        "(Landroid/content/Context;J)V",
                                        QtAndroid::androidActivity().object<jobject>(),
                                        reinterpret_cast<jlong>(this));
diff --git a/src/purchasing/inapppurchase/android/qandroidjni.cpp b/src/purchasing/inapppurchase/android/qandroidjni.cpp
index d1f4920..c202c1e 100644
--- a/src/purchasing/inapppurchase/android/qandroidjni.cpp
+++ b/src/purchasing/inapppurchase/android/qandroidjni.cpp
@@ -130,7 +130,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *)
     if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_6) != JNI_OK)
         return JNI_ERR;
 
-    jclass clazz = env->FindClass("org/qtproject/qt5/android/purchasing/QtInAppPurchase");
+    jclass clazz = env->FindClass("org/qtproject/qt/android/purchasing/QtInAppPurchase");
     if (!clazz)
         return JNI_ERR;
 
diff --git a/src/purchasing/purchasing.pro b/src/purchasing/purchasing.pro
index 1c3fc52..a2b3845 100644
--- a/src/purchasing/purchasing.pro
+++ b/src/purchasing/purchasing.pro
@@ -7,7 +7,7 @@ QMAKE_TARGET_DESCRIPTION = "Purchasing component for Qt."
 QMAKE_DOCS = $$PWD/doc/qtpurchasing.qdocconf
 
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtPurchasing.jar
+    jar/Qt$${QT_MAJOR_VERSION}AndroidPurchasing.jar
 
 HEADERS += \
     $$PWD/qtpurchasingglobal.h