diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-02 16:16:02 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-22 08:20:26 +0000 |
| commit | c8645045d03fd6ece0174f5d72c3b14f9ec2c550 (patch) | |
| tree | b9ba83000ad1dd8c9df4d1a7b6176727f51e980c | |
| parent | 642c0438d3f989e41aa8d5f2814e9a9ffff3c58d (diff) | |
Android: Fix path of qmake_qmake_immediate.qrc in single_abi with qmake
With single_android_abi, the file qmake_qmake_immediate.qrc is laid
directly into the root of the build dir and not under different abis
dirs.
Fixes: QTBUG-87669
Fixes: QTBUG-95202
Fixes: QTBUG-95235
Change-Id: Ie13cccdf2fc323e8fd725a94f3aacab465fa1287
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
(cherry picked from commit e6892f38a084e514bf9c501f3045b297f6260714)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index b77d1f2653..0fc673088b 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -78,8 +78,13 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { contains(resource, ".*qmake_qmake_immediate\\.qrc$") { # They will be created for each architecture, since they could be different # we need to account for all of them - for (arch, ANDROID_ABIS): \ - rescopy += $$absolute_path("qmake_qmake_immediate.qrc", $$OUT_PWD/$$arch) + qmake_qrc_path = "qmake_qmake_immediate.qrc" + multi_android_abi { + for (arch, ANDROID_ABIS): \ + rescopy += $$absolute_path($$qmake_qrc_path, $$OUT_PWD/$$arch) + } else { + rescopy += $$absolute_path($$qmake_qrc_path, $$OUT_PWD) + } } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) } |