diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-15 16:31:36 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-15 16:52:24 +0100 |
| commit | f8736d34d4ec00d27d05993de2dee661089f0dfd (patch) | |
| tree | bc037cdf071a0e2e23448612a7792f2834c12768 /mkspecs/features | |
| parent | a63f72d442df201065efbe6868f669a5855aa557 (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
Pick-to: 6.0
Pick-to: 6.1
Change-Id: If4959581fcc153d9c19d178233297fc7b440b2f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features')
| -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_) } |