diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
commit | da6e958319e95fe564d3b30c931492dd666bfaff (patch) | |
tree | 16ac1556a573daeba5c9c4b795f86aa166ffe467 /mkspecs/features/android/android_deployment_settings.prf | |
parent | 29400a683f96867133b28299c0d0bd6bcf40df35 (diff) | |
parent | a96fc76fa78f3500266b3a34016f9e1bd29b319c (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: Iac056a5e9f59fc8d1929171c18039aeb45be22b8
Diffstat (limited to 'mkspecs/features/android/android_deployment_settings.prf')
-rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 0fc673088b..8437e1542b 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -79,11 +79,12 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { # They will be created for each architecture, since they could be different # we need to account for all of them qmake_qrc_path = "qmake_qmake_immediate.qrc" + base_out_path = $$OUT_PWD/$$RCC_DIR multi_android_abi { for (arch, ANDROID_ABIS): \ - rescopy += $$absolute_path($$qmake_qrc_path, $$OUT_PWD/$$arch) + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path/$$arch) } else { - rescopy += $$absolute_path($$qmake_qrc_path, $$OUT_PWD) + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path) } } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) |