From 165c34fca55ef4b8ee5b5bd21d1ee07000e562f2 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 1 Apr 2021 14:42:18 +0200 Subject: 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 Fixes: QTBUG-88031 Change-Id: I344efe6c477461659a360281da59c4abeae18fc2 Reviewed-by: Alexandru Croitor (cherry picked from commit 72d1393c1d88a70c337e87c661bbeefe46346d23) Reviewed-by: Qt Cherry-pick Bot --- mkspecs/features/resources_functions.prf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index 9b0086596d..6079af8df7 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) { -- cgit v1.2.3