CMake: Remove direct qt_android_generate_deployment_settings call

in our tests. They are not needed anymore since d20f4ae 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 <[email protected]> Reviewed-by: Assam Boudjelthia <[email protected]>
Alegriabaile · Dec 15, 2022 · 5e00c0c · 5e00c0c
1 parent 1fe74c3
commit 5e00c0c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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:<TRUE>:

diff --git 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