diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:21:56 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:21:56 +0300 |
| commit | e89a6f03c4d24f18db36a906a7320035388504ba (patch) | |
| tree | 47f7edb9faa26f6f4e2d3f2eea12133933d86e45 /mkspecs/features/resources_functions.prf | |
| parent | c8989ca20fa5798f7853f07df6e150cc407c64a4 (diff) | |
| parent | 69b8ab23c93785dc69ae43ea04d5620656a4af44 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensource
Change-Id: I3d223d54a832c8365fec4b399550da79f4c1abbb
Diffstat (limited to 'mkspecs/features/resources_functions.prf')
| -rw-r--r-- | mkspecs/features/resources_functions.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index 9b7c409121..afd6405fe9 100644 --- a/mkspecs/features/resources_functions.prf +++ b/mkspecs/features/resources_functions.prf @@ -35,10 +35,10 @@ defineTest(qtFlattenResources) { } RESOURCES -= $$resource - !android|isEmpty(BUILDS)|build_pass { + isEmpty(BUILDS)|build_pass { resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) RESOURCES += $$resource_file - } else { + } 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) { |