diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-17 15:37:51 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-18 11:09:17 +0100 |
| commit | 58556afb6960b442f88649b550aaec8e1a04338b (patch) | |
| tree | f65b7b52fa41cd368cbd1ffd985b92e09dba74b1 /mkspecs/features | |
| parent | fe6338bded8fa595b12ed1ba991cf6e510cd1cc3 (diff) | |
Fix the qmake error when building with qtquickcompiler for iOS
Fix condition when adding qmake_immediate to resources. This condition
was wrongly positive in any non-android case, but also had to check for
BUILD emptiness or build_pass. This cause issue because
qmake_qmake_immediate was added to the RESOURCES variable earlier, than
actually generated.
Fixes: QTBUG-88031
Pick-to: 6.0
Pick-to: 6.1
Pick-to: 5.15
Change-Id: I38dad858a7e81ab709e622ec24baa8f9b80970fa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/resources_functions.prf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index 7a260b471a..9b0086596d 100644 --- a/mkspecs/features/resources_functions.prf +++ b/mkspecs/features/resources_functions.prf @@ -35,9 +35,11 @@ defineTest(qtFlattenResources) { } RESOURCES -= $$resource - !android|isEmpty(BUILDS)|build_pass { - resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) - RESOURCES += $$resource_file + !android { + isEmpty(BUILDS)|build_pass { + resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) + RESOURCES += $$resource_file + } } else { # 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 |