diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-04-01 14:42:18 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-04-07 17:00:17 +0200 |
| commit | 72d1393c1d88a70c337e87c661bbeefe46346d23 (patch) | |
| tree | 5bd5e824b1d7f73899365f43948fa310b09fab7d /mkspecs | |
| parent | 30d5e13768d970e538737d1740898f59157e6017 (diff) | |
Fix condition that adds resources for each Android ABI
If we already have the list of Android ABI in BUILDS, it's not
necessary to generate extra resource while Qt build.
Amends: 58556afb6960b442f88649b550aaec8e1a04338b
Pick-to: 6.0
Pick-to: 6.1
Pick-to: 5.15
Fixes: QTBUG-88031
Change-Id: I344efe6c477461659a360281da59c4abeae18fc2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/resources_functions.prf | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index 729685db10..b525f482ca 100644 --- a/mkspecs/features/resources_functions.prf +++ b/mkspecs/features/resources_functions.prf @@ -35,12 +35,10 @@ defineTest(qtFlattenResources) { } RESOURCES -= $$resource - !android { - isEmpty(BUILDS)|build_pass { - resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) - RESOURCES += $$resource_file - } - } else { + isEmpty(BUILDS)|build_pass { + resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) + RESOURCES += $$resource_file + } else: android { # Android will need a resource file for each architecture make sure it is placed # correctly for other functions that need the right paths for these files for (arch, ANDROID_ABIS) { |