From 5e00c0c5e55c5a87b19655947d97ca6192e02e1e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 13 Dec 2022 15:48:33 +0100 Subject: [PATCH] CMake: Remove direct qt_android_generate_deployment_settings call MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in our tests. They are not needed anymore since d20f4ae706559fb7de8db9dd4845f7ce3936061a got merged and the QT_ANDROID_PACKAGE_SOURCE_DIR property is read at generation time rather than configure time. This means the qt_internal_add_test -> qt_internal_add_executable -> _qt_internal_android_executable_finalizer -> qt_android_generate_deployment_settings calls take care of generation the right value for the property even with CMake 3.16. Remove the direct qt_android_generate_deployment_settings calls, in preparation for their deprecation in public api. Pick-to: 6.5 Task-number: QTBUG-88506 Task-number: QTBUG-88840 Task-number: QTBUG-108508 Change-Id: Ief1d0f9f620bd37beeedde26dedb66f728fa4a6f Reviewed-by: Jörg Bornemann Reviewed-by: Assam Boudjelthia --- tests/auto/corelib/kernel/qjnienvironment/CMakeLists.txt | 2 -- tests/auto/corelib/kernel/qjniobject/CMakeLists.txt | 2 -- tests/auto/corelib/platform/android/CMakeLists.txt | 2 -- tests/manual/permissions/CMakeLists.txt | 1 - 4 files changed, 7 deletions(-) diff --git a/tests/auto/corelib/kernel/qjnienvironment/CMakeLists.txt b/tests/auto/corelib/kernel/qjnienvironment/CMakeLists.txt index 4d40b0b55d..549e11c9ae 100644 --- a/tests/auto/corelib/kernel/qjnienvironment/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qjnienvironment/CMakeLists.txt @@ -14,6 +14,4 @@ if(ANDROID) set_property(TARGET tst_qjnienvironment APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/testdata ) - # QTBUG-88840 - qt_android_generate_deployment_settings(tst_qjnienvironment) endif() diff --git a/tests/auto/corelib/kernel/qjniobject/CMakeLists.txt b/tests/auto/corelib/kernel/qjniobject/CMakeLists.txt index 2b07f2e50c..d35aa2428f 100644 --- a/tests/auto/corelib/kernel/qjniobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qjniobject/CMakeLists.txt @@ -14,6 +14,4 @@ if(ANDROID) set_property(TARGET tst_qjniobject APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/testdata ) - # QTBUG-88840 # special case - qt_android_generate_deployment_settings(tst_qjniobject) # special case endif() diff --git a/tests/auto/corelib/platform/android/CMakeLists.txt b/tests/auto/corelib/platform/android/CMakeLists.txt index 222a36841a..e0ca89a496 100644 --- a/tests/auto/corelib/platform/android/CMakeLists.txt +++ b/tests/auto/corelib/platform/android/CMakeLists.txt @@ -20,8 +20,6 @@ if(ANDROID) set_property(TARGET tst_android APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/testdata ) - # QTBUG-88840 # special case - qt_android_generate_deployment_settings(tst_android) # special case endif() #### Keys ignored in scope 1:.:.:android.pro:: diff --git a/tests/manual/permissions/CMakeLists.txt b/tests/manual/permissions/CMakeLists.txt index ed4b92f621..cc653ca3e8 100644 --- a/tests/manual/permissions/CMakeLists.txt +++ b/tests/manual/permissions/CMakeLists.txt @@ -11,7 +11,6 @@ qt_internal_add_test(tst_qpermissions if(ANDROID) set_property(TARGET tst_qpermissions PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") - qt_android_generate_deployment_settings(tst_qpermissions) elseif(APPLE) # Test an app bundle, but without any usage descriptions