Evaluate the QT_ANDROID_DEPLOYMENT_SETTINGS_FILE property
Make sure that QT_ANDROID_DEPLOYMENT_SETTINGS_FILE is expanded correctly and completely when using it in custom commands. Task-number: QTBUG-114888 Pick-to: 6.5 6.6 Change-Id: I87c9cb052ea6afedd129fec0a1c415ad38e8eeb5 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
parent
b7184e1104
commit
0be35f3a7b
@ -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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user