1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix path of qmake_qmake_immediate.qrc in single_abi with qmake

Browse Source 
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 <andy.shaw@qt.io>
This commit is contained in:
Assam Boudjelthia 2021-09-02 16:16:02 +03:00
parent c608bdfb25
commit e6892f38a0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mkspecs/features/android/android_deployment_settings.prf
View File

@ -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_)
}