diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-12-13 15:48:33 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-12-15 20:23:28 +0100 |
| commit | 5e00c0c5e55c5a87b19655947d97ca6192e02e1e (patch) | |
| tree | 5f8aa7559892ad8ce2eabf14f8ac5793b5476a56 /tests/auto/corelib/platform | |
| parent | 1fe74c3bd3f727551b8168ee9f3e642d42233d55 (diff) | |
CMake: Remove direct qt_android_generate_deployment_settings call
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 <joerg.bornemann@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/corelib/platform')
| -rw-r--r-- | tests/auto/corelib/platform/android/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
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:<TRUE>: |