diff options
| -rw-r--r-- | mkspecs/features/resources_functions.prf | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index f0ca2ed793..fe2dc17d4d 100644 --- a/mkspecs/features/resources_functions.prf +++ b/mkspecs/features/resources_functions.prf @@ -34,7 +34,18 @@ defineTest(qtFlattenResources) { next() } - resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD) + RESOURCES -= $$resource + !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 + for (arch, ANDROID_ABIS) { + resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD/$$arch) + RESOURCES += $$resource_file + } + } isEmpty(BUILDS)|build_pass { # Collection of files, generate qrc file @@ -69,9 +80,6 @@ defineTest(qtFlattenResources) { !write_file($$resource_file, resource_file_content): \ error() } - - RESOURCES -= $$resource - RESOURCES += $$resource_file } export(RCC_DIR) export(QMAKE_RESOURCES_IMMEDIATE_NR) |