From e6892f38a084e514bf9c501f3045b297f6260714 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Thu, 2 Sep 2021 16:16:02 +0300 Subject: 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. Pick-to: 6.2.0 6.2 5.15 Fixes: QTBUG-87669 Fixes: QTBUG-95202 Fixes: QTBUG-95235 Change-Id: Ie13cccdf2fc323e8fd725a94f3aacab465fa1287 Reviewed-by: Andy Shaw --- mkspecs/features/android/android_deployment_settings.prf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'mkspecs/features') diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index bc55306fb7..037dc23772 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -89,8 +89,14 @@ contains(TEMPLATE, ".*app"):!build_pass { 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/$$RCC_DIR/$$arch) + 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, $$base_out_path/$$arch) + } else { + rescopy += $$absolute_path($$qmake_qrc_path, $$base_out_path) + } } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) } -- cgit v1.2.3