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 <alexandru.croitor@qt.io>

6 files changed, 10 insertions, 10 deletions

diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 978a2c221e..1b34658300 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -34,7 +34,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package org.qtproject.qt5.android.bindings;
+package org.qtproject.qt.android.bindings;
 
 import android.app.Activity;
 import android.app.Dialog;
@@ -60,7 +60,7 @@ import android.view.View;
 import android.view.WindowManager.LayoutParams;
 import android.view.accessibility.AccessibilityEvent;
 
-import org.qtproject.qt5.android.QtNative;
+import org.qtproject.qt.android.QtNative;
 
 public class QtActivity extends Activity
 {
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java
index 9e00b14999..da6b01c9a7 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java
@@ -34,7 +34,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package org.qtproject.qt5.android.bindings;
+package org.qtproject.qt.android.bindings;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -87,7 +87,7 @@ public class QtActivityLoader extends QtLoader {
 
     @Override
     protected String loaderClassName() {
-        return "org.qtproject.qt5.android.QtActivityDelegate";
+        return "org.qtproject.qt.android.QtActivityDelegate";
     }
 
     @Override
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java
index 47dcde304c..34a3bc28ea 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java
@@ -34,7 +34,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package org.qtproject.qt5.android.bindings;
+package org.qtproject.qt.android.bindings;
 
 import android.app.Application;
 
@@ -73,7 +73,7 @@ public class QtApplication extends Application
 
         ArrayList<Method> delegateMethods = new ArrayList<Method>();
         for (Method m : listener.getClass().getMethods()) {
-            if (m.getDeclaringClass().getName().startsWith("org.qtproject.qt5.android"))
+            if (m.getDeclaringClass().getName().startsWith("org.qtproject.qt.android"))
                 delegateMethods.add(m);
         }
 
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
index 1e72aa3841..3dfac43339 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
@@ -34,7 +34,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package org.qtproject.qt5.android.bindings;
+package org.qtproject.qt.android.bindings;
 
 import android.app.AlertDialog;
 import android.content.ComponentName;
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
index cdd6c1efea..cb24d1f541 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
@@ -34,7 +34,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package org.qtproject.qt5.android.bindings;
+package org.qtproject.qt.android.bindings;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java
index e32a4048e1..f0606a4d9b 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java
@@ -34,7 +34,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package org.qtproject.qt5.android.bindings;
+package org.qtproject.qt.android.bindings;
 
 import android.os.Bundle;
 import android.content.ComponentName;
@@ -70,7 +70,7 @@ public class QtServiceLoader extends QtLoader {
 
     @Override
     protected String loaderClassName() {
-        return "org.qtproject.qt5.android.QtServiceDelegate";
+        return "org.qtproject.qt.android.QtServiceDelegate";
     }
 
     @Override