diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-15 16:31:36 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-16 12:04:31 +0000 |
| commit | 44bc8a63534f4e121a156a72f8ce72a476e6a312 (patch) | |
| tree | 7f7b3bf9978565fc839fe3d23c27c0b259ebc3ee | |
| parent | 4d1808e502222928d98e388a3875acda19818df5 (diff) | |
Fix qmake_qmake_immediate path for Android
Add missed RCC_DIR to the qmake_qmake_immediate.qrc path,
when generating android deployment settings.
Fixes: QTBUG-90969
Change-Id: If4959581fcc153d9c19d178233297fc7b440b2f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f8736d34d4ec00d27d05993de2dee661089f0dfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index c351aa5e69..4df019270e 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -90,7 +90,7 @@ 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 for (arch, ANDROID_ABIS): \ - rescopy += $$absolute_path("qmake_qmake_immediate.qrc", $$OUT_PWD/$$arch) + rescopy += $$absolute_path("qmake_qmake_immediate.qrc", $$OUT_PWD/$$RCC_DIR/$$arch) } else { contains(resource, ".*\\.qrc$"): rescopy += $$absolute_path($$resource, $$_PRO_FILE_PWD_) } |