diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-07 20:33:35 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-07 20:33:35 +0000 |
| commit | 8d16237cfa8e3070dcb26932a311fc566b4e9072 (patch) | |
| tree | d1ef66d9fcb49d13cdbeb5d66bb1592f3eb9c471 /mkspecs | |
| parent | 72ae064886cae04387067d627f65f6f203205778 (diff) | |
| parent | 3f0858ed10d249acb942597b4065080411281b87 (diff) | |
Merge integration refs/builds/qtci/dev/1617809473
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) { |