diff options
| author | Alexey Edelev <[email protected]> | 2023-09-25 15:19:37 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2023-09-27 23:28:32 +0000 |
| commit | 88d62ca1acd5735f18331ca3528ede11a54887ca (patch) | |
| tree | 0271638ab5b4d9340aa615696075629b9083607e | |
| parent | 965ab2fcebf5b13ab48a8da8e58a88d48f6105ea (diff) | |
Use the actual target name as base name for android deployment settings
QtC is unable to find the deployment settigns if target uses custom
OUTPUT_NAME. There is no particular reason for using the target
OUTPUT_NAME property as the base name for android deployment settings.
[ChangeLog][General][Android] The target name is used as a base name of
android deployment settings, but not the OUTPUT_NAME property.
Pick-to: 6.2
Fixes: QTBUG-117509
Change-Id: I1ac3b0ad305dc55289bef39c6e946bcf684e772f
Reviewed-by: Joerg Bornemann <[email protected]>
(cherry picked from commit 9349e463d4d6c58d3fb3e3512e104b07a5082188)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
(cherry picked from commit 416081ef4f1ec63755376e55dd6a4d83e438c049)
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 370041fe8ee..9a44308a0f6 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -107,7 +107,7 @@ function(qt6_android_generate_deployment_settings target) set(config_suffix "$<$<NOT:$<CONFIG:${first_config_type}>>:-$<CONFIG>>") endif() set(deploy_file - "${target_binary_dir}/android-${target_output_name}-deployment-settings${config_suffix}.json") + "${target_binary_dir}/android-${target}-deployment-settings${config_suffix}.json") set(file_contents "{\n") # content begin |