1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Remove direct qt_android_generate_deployment_settings call

Browse Source 
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.

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>
(cherry picked from commit 5e00c0c5e55c5a87b19655947d97ca6192e02e1e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2022-12-13 15:48:33 +01:00 committed by Qt Cherry-pick Bot
parent 4b2f5a9abc
commit 24a88bddcd
4 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/kernel/qjnienvironment/CMakeLists.txt
View File

@ -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()

2
tests/auto/corelib/kernel/qjniobject/CMakeLists.txt
View File

@ -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()

2
tests/auto/corelib/platform/android/CMakeLists.txt
View File

@ -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>:

1
tests/manual/permissions/CMakeLists.txt
View File

@ -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