1 files changed, 43 insertions, 21 deletions
diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt
index 0fb666bcb3..698853588c 100644
--- a/src/android/jar/CMakeLists.txt
+++ b/src/android/jar/CMakeLists.txt
@@ -1,32 +1,54 @@
-# Generated from jar.pro.
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 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/QtAccessibilityDelegate.java
+    src/org/qtproject/qt/android/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/QtApplicationBase.java
+    src/org/qtproject/qt/android/QtActivityBase.java
+    src/org/qtproject/qt/android/QtServiceBase.java
+    src/org/qtproject/qt/android/QtActivityDelegate.java
+    src/org/qtproject/qt/android/QtInputDelegate.java
+    src/org/qtproject/qt/android/QtLoader.java
+    src/org/qtproject/qt/android/QtActivityLoader.java
+    src/org/qtproject/qt/android/QtServiceLoader.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/QtSurfaceInterface.java
+    src/org/qtproject/qt/android/QtSurface.java
+    src/org/qtproject/qt/android/QtTextureView.java
+    src/org/qtproject/qt/android/QtThread.java
+    src/org/qtproject/qt/android/extras/QtAndroidBinder.java
+    src/org/qtproject/qt/android/extras/QtAndroidServiceConnection.java
+    src/org/qtproject/qt/android/extras/QtNative.java
+    src/org/qtproject/qt/android/QtClipboardManager.java
+    src/org/qtproject/qt/android/QtDisplayManager.java
+    src/org/qtproject/qt/android/UsedFromNativeCode.java
+    src/org/qtproject/qt/android/QtRootLayout.java
+    src/org/qtproject/qt/android/QtWindow.java
+    src/org/qtproject/qt/android/QtActivityDelegateBase.java
+    src/org/qtproject/qt/android/QtEmbeddedDelegate.java
+    src/org/qtproject/qt/android/QtEmbeddedDelegateFactory.java
+    src/org/qtproject/qt/android/QtEmbeddedLoader.java
+    src/org/qtproject/qt/android/QtView.java
 )
 
-qt_internal_add_jar(QtAndroid
+qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}Android
     INCLUDE_JARS ${QT_ANDROID_JAR}
     SOURCES ${java_sources}
     OUTPUT_DIR "${QT_BUILD_DIR}/jar"
 )
 
-install_jar(QtAndroid
-    DESTINATION jar
+qt_path_join(destination ${INSTALL_DATADIR} "jar")
+
+install_jar(Qt${QtBase_VERSION_MAJOR}Android
+    DESTINATION ${destination}
     COMPONENT Devel
 )
-