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>

45 files changed, 96 insertions, 96 deletions

diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 61a022fd15..576beac1c4 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -959,7 +959,7 @@
     dependencies used by the module in a \c .jar format, for example:
 
     \badcode
-    ANDROID_BUNDLED_JAR_DEPENDENCIES += jar/QtAndroid.jar
+    ANDROID_BUNDLED_JAR_DEPENDENCIES += jar/Qt6Android.jar
     \endcode
 
     \target ANDROID_DEPLOYMENT_DEPENDENCIES
diff --git a/src/android/jar/.prev_CMakeLists.txt b/src/android/jar/.prev_CMakeLists.txt
index bff97e90ef..9be8738fa2 100644
--- a/src/android/jar/.prev_CMakeLists.txt
+++ b/src/android/jar/.prev_CMakeLists.txt
@@ -1,21 +1,21 @@
 # Generated from jar.pro.
 
 set(java_sources
-    src/org/qtproject/qt5/android//accessibility/QtAccessibilityDelegate.java
-    src/org/qtproject/qt5/android//accessibility/QtNativeAccessibility.java
-    src/org/qtproject/qt5/android//CursorHandle.java
-    src/org/qtproject/qt5/android//EditContextView.java
-    src/org/qtproject/qt5/android//EditPopupMenu.java
-    src/org/qtproject/qt5/android//ExtractStyle.java
-    src/org/qtproject/qt5/android//QtActivityDelegate.java
-    src/org/qtproject/qt5/android//QtEditText.java
-    src/org/qtproject/qt5/android//QtInputConnection.java
-    src/org/qtproject/qt5/android//QtLayout.java
-    src/org/qtproject/qt5/android//QtMessageDialogHelper.java
-    src/org/qtproject/qt5/android//QtNative.java
-    src/org/qtproject/qt5/android//QtNativeLibrariesDir.java
-    src/org/qtproject/qt5/android//QtSurface.java
-    src/org/qtproject/qt5/android//QtThread.java
+    src/org/qtproject/qt/android//accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt/android//accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt/android//CursorHandle.java
+    src/org/qtproject/qt/android//EditContextView.java
+    src/org/qtproject/qt/android//EditPopupMenu.java
+    src/org/qtproject/qt/android//ExtractStyle.java
+    src/org/qtproject/qt/android//QtActivityDelegate.java
+    src/org/qtproject/qt/android//QtEditText.java
+    src/org/qtproject/qt/android//QtInputConnection.java
+    src/org/qtproject/qt/android//QtLayout.java
+    src/org/qtproject/qt/android//QtMessageDialogHelper.java
+    src/org/qtproject/qt/android//QtNative.java
+    src/org/qtproject/qt/android//QtNativeLibrariesDir.java
+    src/org/qtproject/qt/android//QtSurface.java
+    src/org/qtproject/qt/android//QtThread.java
 )
 
 qt_internal_add_jar(QtAndroid
diff --git a/src/android/jar/AndroidManifest.xml b/src/android/jar/AndroidManifest.xml
index cef88f7f19..b461cac762 100644
--- a/src/android/jar/AndroidManifest.xml
+++ b/src/android/jar/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.qtproject.qt5.android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="org.qtproject.qt.android">
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <uses-sdk android:minSdkVersion="9" />
 </manifest>
diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt
index 0fb666bcb3..4336c58ae5 100644
--- a/src/android/jar/CMakeLists.txt
+++ b/src/android/jar/CMakeLists.txt
@@ -1,31 +1,31 @@
 # Generated from jar.pro.
 
 set(java_sources
-    src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
-    src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java
-    src/org/qtproject/qt5/android/CursorHandle.java
-    src/org/qtproject/qt5/android/EditContextView.java
-    src/org/qtproject/qt5/android/EditPopupMenu.java
-    src/org/qtproject/qt5/android/ExtractStyle.java
-    src/org/qtproject/qt5/android/QtActivityDelegate.java
-    src/org/qtproject/qt5/android/QtEditText.java
-    src/org/qtproject/qt5/android/QtInputConnection.java
-    src/org/qtproject/qt5/android/QtLayout.java
-    src/org/qtproject/qt5/android/QtMessageDialogHelper.java
-    src/org/qtproject/qt5/android/QtNative.java
-    src/org/qtproject/qt5/android/QtNativeLibrariesDir.java
-    src/org/qtproject/qt5/android/QtSurface.java
-    src/org/qtproject/qt5/android/QtThread.java
-    src/org/qtproject/qt5/android/QtServiceDelegate.java # special case
+    src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
+    src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java
+    src/org/qtproject/qt/android/CursorHandle.java
+    src/org/qtproject/qt/android/EditContextView.java
+    src/org/qtproject/qt/android/EditPopupMenu.java
+    src/org/qtproject/qt/android/ExtractStyle.java
+    src/org/qtproject/qt/android/QtActivityDelegate.java
+    src/org/qtproject/qt/android/QtEditText.java
+    src/org/qtproject/qt/android/QtInputConnection.java
+    src/org/qtproject/qt/android/QtLayout.java
+    src/org/qtproject/qt/android/QtMessageDialogHelper.java
+    src/org/qtproject/qt/android/QtNative.java
+    src/org/qtproject/qt/android/QtNativeLibrariesDir.java
+    src/org/qtproject/qt/android/QtSurface.java
+    src/org/qtproject/qt/android/QtThread.java
+    src/org/qtproject/qt/android/QtServiceDelegate.java # special case
 )
 
-qt_internal_add_jar(QtAndroid
+qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}Android # special case
     INCLUDE_JARS ${QT_ANDROID_JAR}
     SOURCES ${java_sources}
     OUTPUT_DIR "${QT_BUILD_DIR}/jar"
 )
 
-install_jar(QtAndroid
+install_jar(Qt${QtBase_VERSION_MAJOR}Android # special case
     DESTINATION jar
     COMPONENT Devel
 )
diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro
index 24a83d56a1..de86f855ed 100644
--- a/src/android/jar/jar.pro
+++ b/src/android/jar/jar.pro
@@ -1,10 +1,10 @@
-TARGET = QtAndroid
+TARGET = Qt$${QT_MAJOR_VERSION}Android
 
 CONFIG += java
 
 DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
 
-PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/
+PATHPREFIX = $$PWD/src/org/qtproject/qt/android/
 
 JAVACLASSPATH += $$PWD/src/
 JAVASOURCES += \
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;
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
diff --git a/src/android/templates/AndroidManifest.xml b/src/android/templates/AndroidManifest.xml
index d42ed067c6..abb6b1e354 100644
--- a/src/android/templates/AndroidManifest.xml
+++ b/src/android/templates/AndroidManifest.xml
@@ -9,8 +9,8 @@
     <!-- %%INSERT_FEATURES -->
 
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
-    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
+    <application android:hardwareAccelerated="true" android:name="org.qtproject.qt.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:extractNativeLibs="true">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:name="org.qtproject.qt.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index a3e1fa7d29..3ad8f86772 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -368,7 +368,7 @@ endif()
 
 if(ANDROID)
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
-        jar/QtAndroid.jar
+        jar/Qt${QtBase_VERSION_MAJOR}Android.jar # special case
     )
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES
         plugins/platforms/libplugins_platforms_qtforandroid.so
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 73479e2309..a32ab7abeb 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -24,7 +24,7 @@ QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf
 ANDROID_LIB_DEPENDENCIES = \
     plugins/platforms/libplugins_platforms_qtforandroid.so
 ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-    jar/QtAndroid.jar
+    jar/Qt$${QT_MAJOR_VERSION}Android.jar
 ANDROID_PERMISSIONS = \
     android.permission.INTERNET \
     android.permission.WRITE_EXTERNAL_STORAGE
diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp
index f845eb37ed..835db956ed 100644
--- a/src/corelib/kernel/qjnihelpers.cpp
+++ b/src/corelib/kernel/qjnihelpers.cpp
@@ -340,7 +340,7 @@ static void setNativeService(JNIEnv *env, jclass, jobject service)
 
 jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
 {
-    jclass jQtNative = env->FindClass("org/qtproject/qt5/android/QtNative");
+    jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative");
 
     if (exceptionCheck(env))
         return JNI_ERR;
@@ -543,7 +543,7 @@ QtAndroidPrivate::PermissionsHash QtAndroidPrivate::requestPermissionsSync(JNIEn
 
 QtAndroidPrivate::PermissionsResult QtAndroidPrivate::checkPermission(const QString &permission)
 {
-    const auto res = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/QtNative",
+    const auto res = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/QtNative",
                                                                "checkSelfPermission",
                                                                "(Ljava/lang/String;)I",
                                                                QJNIObjectPrivate::fromString(permission).object());
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index d94fff5f7f..a678d3f4a7 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -258,7 +258,7 @@ qt_internal_extend_target(Network CONDITION UNIX AND NOT ANDROID AND NOT MACOS A
 
 if(ANDROID AND (ANDROID))
     set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
-        jar/QtAndroidNetwork.jar
+        jar/Qt${QtBase_VERSION_MAJOR}AndroidNetwork.jar # special case
     )
 endif()
 
diff --git a/src/network/android/jar/CMakeLists.txt b/src/network/android/jar/CMakeLists.txt
index c2635ec666..e8081c025b 100644
--- a/src/network/android/jar/CMakeLists.txt
+++ b/src/network/android/jar/CMakeLists.txt
@@ -1,16 +1,16 @@
 # Generated from jar.pro.
 
 set(java_sources
-    src/org/qtproject/qt5/android/network/QtNetwork.java
+    src/org/qtproject/qt/android/network/QtNetwork.java
 )
 
-qt_internal_add_jar(QtAndroidNetwork
+qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
     INCLUDE_JARS ${QT_ANDROID_JAR}
     SOURCES ${java_sources}
     OUTPUT_DIR "${QT_BUILD_DIR}/jar"
 )
 
-install_jar(QtAndroidNetwork
+install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
     DESTINATION jar
     COMPONENT Devel
 )
diff --git a/src/network/android/jar/jar.pro b/src/network/android/jar/jar.pro
index 4af1012c1c..dd05da3a19 100644
--- a/src/network/android/jar/jar.pro
+++ b/src/network/android/jar/jar.pro
@@ -1,6 +1,6 @@
 CONFIG += single_arch
 
-TARGET = QtAndroidNetwork
+TARGET = Qt$${QT_MAJOR_VERSION}AndroidNetwork
 
 load(qt_build_paths)
 CONFIG += java
@@ -8,7 +8,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/jar
 
 JAVACLASSPATH += $$PWD/src
 
-JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/network/QtNetwork.java
+JAVASOURCES += $$PWD/src/org/qtproject/qt/android/network/QtNetwork.java
 
 # install
 target.path = $$[QT_INSTALL_PREFIX]/jar
diff --git a/src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java b/src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java
index 249ffe61a5..8f0abf285f 100644
--- a/src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java
+++ b/src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-package org.qtproject.qt5.android.network;
+package org.qtproject.qt.android.network;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index cc78555805..aa3e9df254 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -92,4 +92,4 @@ else:android: SOURCES += kernel/qnetworkproxy_android.cpp
 else: SOURCES += kernel/qnetworkproxy_generic.cpp
 
 android: ANDROID_BUNDLED_JAR_DEPENDENCIES = \
-        jar/QtAndroidNetwork.jar
+        jar/Qt$${QT_MAJOR_VERSION}AndroidNetwork.jar
diff --git a/src/network/kernel/qnetworkproxy_android.cpp b/src/network/kernel/qnetworkproxy_android.cpp
index ddfe86960f..1a6fe2b70e 100644
--- a/src/network/kernel/qnetworkproxy_android.cpp
+++ b/src/network/kernel/qnetworkproxy_android.cpp
@@ -54,7 +54,7 @@ public:
 
 Q_GLOBAL_STATIC(ProxyInfoObject, proxyInfoInstance)
 
-static const char networkClass[] = "org/qtproject/qt5/android/network/QtNetwork";
+static const char networkClass[] = "org/qtproject/qt/android/network/QtNetwork";
 
 ProxyInfoObject::ProxyInfoObject()
 {
diff --git a/src/network/ssl/qsslsocket_openssl_android.cpp b/src/network/ssl/qsslsocket_openssl_android.cpp
index b5d2458d56..deec1532a2 100644
--- a/src/network/ssl/qsslsocket_openssl_android.cpp
+++ b/src/network/ssl/qsslsocket_openssl_android.cpp
@@ -61,7 +61,7 @@ QList<QByteArray> QSslSocketPrivate::fetchSslCertificateData()
 {
     QList<QByteArray> certificateData;
 
-    QJNIObjectPrivate certificates = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/QtNative",
+    QJNIObjectPrivate certificates = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
                                                                                "getSSLCertificates",
                                                                                "()[[B");
     if (!certificates.isValid())
diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp
index e552b8fa86..bdbf2186ba 100644
--- a/src/plugins/platforms/android/androidcontentfileengine.cpp
+++ b/src/plugins/platforms/android/androidcontentfileengine.cpp
@@ -65,7 +65,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode)
         openModeStr += QLatin1Char('a');
     }
 
-    const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt5/android/QtNative",
+    const auto fd = QJNIObjectPrivate::callStaticMethod<jint>("org/qtproject/qt/android/QtNative",
         "openFdForContentUrl",
         "(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)I",
         QtAndroidPrivate::context(),
@@ -82,7 +82,7 @@ bool AndroidContentFileEngine::open(QIODevice::OpenMode openMode)
 qint64 AndroidContentFileEngine::size() const
 {
     const jlong size = QJNIObjectPrivate::callStaticMethod<jlong>(
-            "org/qtproject/qt5/android/QtNative", "getSize",
+            "org/qtproject/qt/android/QtNative", "getSize",
             "(Landroid/content/Context;Ljava/lang/String;)J", QtAndroidPrivate::context(),
             QJNIObjectPrivate::fromString(fileName(DefaultName)).object());
     return (qint64)size;
@@ -93,12 +93,12 @@ AndroidContentFileEngine::FileFlags AndroidContentFileEngine::fileFlags(FileFlag
     FileFlags commonFlags(ReadOwnerPerm|ReadUserPerm|ReadGroupPerm|ReadOtherPerm|ExistsFlag);
     FileFlags flags;
     const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>(
-            "org/qtproject/qt5/android/QtNative", "checkIfDir",
+            "org/qtproject/qt/android/QtNative", "checkIfDir",
             "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(),
             QJNIObjectPrivate::fromString(fileName(DefaultName)).object());
     // If it is a directory then we know it exists so there is no reason to explicitly check
     const bool exists = isDir ? true : QJNIObjectPrivate::callStaticMethod<jboolean>(
-            "org/qtproject/qt5/android/QtNative", "checkFileExists",
+            "org/qtproject/qt/android/QtNative", "checkFileExists",
             "(Landroid/content/Context;Ljava/lang/String;)Z", QtAndroidPrivate::context(),
             QJNIObjectPrivate::fromString(fileName(DefaultName)).object());
     if (!exists && !isDir)
@@ -176,12 +176,12 @@ bool AndroidContentFileEngineIterator::hasNext() const
         if (path().isEmpty())
             return false;
         const bool isDir = QJNIObjectPrivate::callStaticMethod<jboolean>(
-                             "org/qtproject/qt5/android/QtNative", "checkIfDir",
+                             "org/qtproject/qt/android/QtNative", "checkIfDir",
                              "(Landroid/content/Context;Ljava/lang/String;)Z",
                              QtAndroidPrivate::context(),
                              QJNIObjectPrivate::fromString(path()).object());
         if (isDir) {
-            QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt5/android/QtNative",
+            QJNIObjectPrivate objArray = QJNIObjectPrivate::callStaticObjectMethod("org/qtproject/qt/android/QtNative",
                                            "listContentsFromTreeUri",
                                            "(Landroid/content/Context;Ljava/lang/String;)[Ljava/lang/String;",
                                            QtAndroidPrivate::context(),
diff --git a/src/plugins/platforms/android/androidjniaccessibility.cpp b/src/plugins/platforms/android/androidjniaccessibility.cpp
index a27c200362..4d263831e1 100644
--- a/src/plugins/platforms/android/androidjniaccessibility.cpp
+++ b/src/plugins/platforms/android/androidjniaccessibility.cpp
@@ -318,7 +318,7 @@ if (!clazz) { \
     bool registerNatives(JNIEnv *env)
     {
         jclass clazz;
-        FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/accessibility/QtNativeAccessibility");
+        FIND_AND_CHECK_CLASS("org/qtproject/qt/android/accessibility/QtNativeAccessibility");
         jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz));
 
         if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp
index f920942fd0..9e2cb228b3 100644
--- a/src/plugins/platforms/android/androidjnimain.cpp
+++ b/src/plugins/platforms/android/androidjnimain.cpp
@@ -806,7 +806,7 @@ if (!VAR) { \
 static int registerNatives(JNIEnv *env)
 {
     jclass clazz;
-    FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/QtNative");
+    FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNative");
     m_applicationClass = static_cast<jclass>(env->NewGlobalRef(clazz));
 
     if (env->RegisterNatives(m_applicationClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index 84745f3f28..5add7b0746 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -92,8 +92,8 @@ private:
 } // namespace anonymous
 
 static QAndroidInputContext *m_androidInputContext = 0;
-static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt5/android/QtNativeInputConnection";
-static char const *const QtExtractedTextClassName = "org/qtproject/qt5/android/QtExtractedText";
+static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt/android/QtNativeInputConnection";
+static char const *const QtExtractedTextClassName = "org/qtproject/qt/android/QtExtractedText";
 static jclass m_extractedTextClass = 0;
 static jmethodID m_classConstructorMethodID = 0;
 static jfieldID m_partialEndOffsetFieldID = 0;
@@ -392,7 +392,7 @@ static JNINativeMethod methods[] = {
     {"deleteSurroundingText", "(II)Z", (void *)deleteSurroundingText},
     {"finishComposingText", "()Z", (void *)finishComposingText},
     {"getCursorCapsMode", "(I)I", (void *)getCursorCapsMode},
-    {"getExtractedText", "(III)Lorg/qtproject/qt5/android/QtExtractedText;", (void *)getExtractedText},
+    {"getExtractedText", "(III)Lorg/qtproject/qt/android/QtExtractedText;", (void *)getExtractedText},
     {"getSelectedText", "(I)Ljava/lang/String;", (void *)getSelectedText},
     {"getTextAfterCursor", "(II)Ljava/lang/String;", (void *)getTextAfterCursor},
     {"getTextBeforeCursor", "(II)Ljava/lang/String;", (void *)getTextBeforeCursor},
diff --git a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
index 0297734bc8..9ce63dceec 100644
--- a/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
+++ b/src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 namespace QtAndroidDialogHelpers {
 static jclass g_messageDialogHelperClass = 0;
 
-static const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt5/android/QtMessageDialogHelper";
+static const char QtMessageHandlerHelperClassName[] = "org/qtproject/qt/android/QtMessageDialogHelper";
 
 QAndroidPlatformMessageDialogHelper::QAndroidPlatformMessageDialogHelper()
     :m_buttonId(-1)
@@ -190,7 +190,7 @@ bool registerNatives(JNIEnv *env)
         return false;
     }
     g_messageDialogHelperClass = static_cast<jclass>(env->NewGlobalRef(clazz));
-    FIND_AND_CHECK_CLASS("org/qtproject/qt5/android/QtNativeDialogHelper");
+    FIND_AND_CHECK_CLASS("org/qtproject/qt/android/QtNativeDialogHelper");
     jclass appClass = static_cast<jclass>(env->NewGlobalRef(clazz));
 
     if (env->RegisterNatives(appClass, methods, sizeof(methods) / sizeof(methods[0])) < 0) {
diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
index 1b48769385..acfa4542a1 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp
@@ -176,7 +176,7 @@ void QAndroidPlatformFileDialogHelper::setMimeTypes()
                 JniIntentClass, "EXTRA_MIME_TYPES", "Ljava/lang/String;");
 
         QJNIObjectPrivate mimeTypesArray = QJNIObjectPrivate::callStaticObjectMethod(
-                "org/qtproject/qt5/android/QtNative",
+                "org/qtproject/qt/android/QtNative",
                 "getStringArray",
                 "(Ljava/lang/String;)[Ljava/lang/String;",
                 QJNIObjectPrivate::fromString(mimeTypes.join(",")).object());
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 047d78773d..daf3878230 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -680,7 +680,7 @@ bool alwaysOverwritableFile(const QString &fileName)
     return (fileName.endsWith(QLatin1String("/res/values/libs.xml"))
             || fileName.endsWith(QLatin1String("/AndroidManifest.xml"))
             || fileName.endsWith(QLatin1String("/res/values/strings.xml"))
-            || fileName.endsWith(QLatin1String("/src/org/qtproject/qt5/android/bindings/QtActivity.java")));
+            || fileName.endsWith(QLatin1String("/src/org/qtproject/qt/android/bindings/QtActivity.java")));
 }