From 1907599bfd817e00c7f42b8cb941ebf93a098e7f Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 29 Sep 2020 11:48:04 +0300 Subject: 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 --- src/corelib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/CMakeLists.txt') 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 -- cgit v1.2.3