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>

16 files changed, 18 insertions, 18 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
index 38cc695c37..fd650a149c 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/EditContextView.java b/src/android/jar/src/org/qtproject/qt/android/EditContextView.java
index 104132934d..c96ab11ffa 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/EditContextView.java
+++ b/src/android/jar/src/org/qtproject/qt/android/EditContextView.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 
 import android.content.Context;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
index 18a8b36273..131f2a103f 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java
+++ b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
index ae06506c96..ff321fabde 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
index 92d9c46043..e04da7376d 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.app.Activity;
 import android.content.Context;
@@ -96,7 +96,7 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import org.qtproject.qt5.android.accessibility.QtAccessibilityDelegate;
+import org.qtproject.qt.android.accessibility.QtAccessibilityDelegate;
 
 public class QtActivityDelegate
 {
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java b/src/android/jar/src/org/qtproject/qt/android/QtEditText.java
index e6da5482ca..ff58b6b27f 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtEditText.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEditText.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.content.Context;
 import android.text.InputType;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
index 7c621a11e2..dab8ebf324 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.content.Context;
 import android.view.inputmethod.BaseInputConnection;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
index 63993f81b5..a65df48a17 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtLayout.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtLayout.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java
index a3bbff4e1a..c1fd998764 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java
@@ -38,7 +38,7 @@
  ****************************************************************************/
 
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt/android/QtNative.java
index 6fd6a9ca98..40b3a79bf0 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtNative.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java b/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java
index 4a732f7f7f..7283570609 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java
index 6e75eafeab..8ac4395ac9 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.app.Service;
 import android.content.Context;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
index 08b5a80f7e..1d89aeebef 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtSurface.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtSurface.java
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtThread.java b/src/android/jar/src/org/qtproject/qt/android/QtThread.java
index 975e787345..1689174e86 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtThread.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtThread.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android;
+package org.qtproject.qt.android;
 
 import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
diff --git a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
index 79caaf318e..1591a5b52e 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 
-package org.qtproject.qt5.android.accessibility;
+package org.qtproject.qt.android.accessibility;
 
 import android.accessibilityservice.AccessibilityService;
 import android.app.Activity;
@@ -59,7 +59,7 @@ import android.content.Context;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.qtproject.qt5.android.QtActivityDelegate;
+import org.qtproject.qt.android.QtActivityDelegate;
 
 public class QtAccessibilityDelegate extends View.AccessibilityDelegate
 {
diff --git a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java
index a83174377d..aa6f7c5a67 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java
+++ b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android.accessibility;
+package org.qtproject.qt.android.accessibility;
 
 import android.graphics.Rect;
 import android.view.accessibility.AccessibilityNodeInfo;