From 4a541564f479433c554a2285158b429737255f1a Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 17 Feb 2021 15:37:51 +0100 Subject: 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 Change-Id: I38dad858a7e81ab709e622ec24baa8f9b80970fa Reviewed-by: Joerg Bornemann (cherry picked from commit 58556afb6960b442f88649b550aaec8e1a04338b) Reviewed-by: Qt Cherry-pick Bot --- mkspecs/features/resources_functions.prf | 8 +++++--- 1 file 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 -- cgit v1.2.3