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

Evaluate the QT_ANDROID_DEPLOYMENT_SETTINGS_FILE property

Browse Source 
Make sure that QT_ANDROID_DEPLOYMENT_SETTINGS_FILE is expanded
correctly and completely when using it in custom commands.

Task-number: QTBUG-114888
Change-Id: I87c9cb052ea6afedd129fec0a1c415ad38e8eeb5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 0be35f3a7bb97bacf7ddd47729f2f97dcf750b80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2023-06-27 11:45:11 +02:00 committed by Qt Cherry-pick Bot
parent 8bd5865f76
commit a869f448e9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/Qt6AndroidMacros.cmake
View File

@ -367,7 +367,11 @@ function(qt6_android_add_apk_target target)
endif() endif()
# Use genex to get path to the deployment settings, the above check only to confirm that # Use genex to get path to the deployment settings, the above check only to confirm that
# qt6_android_add_apk_target is called on an android executable target. # qt6_android_add_apk_target is called on an android executable target.
set(deployment_file "$<TARGET_PROPERTY:${target},QT_ANDROID_DEPLOYMENT_SETTINGS_FILE>") string(JOIN "" deployment_file
"$<GENEX_EVAL:"
"$<TARGET_PROPERTY:${target},QT_ANDROID_DEPLOYMENT_SETTINGS_FILE>"
">"
)
# Make global apk and aab targets depend on the current apk target. # Make global apk and aab targets depend on the current apk target.
if(TARGET aab) if(TARGET aab)