diff options
Diffstat (limited to 'mkspecs/features/resources_functions.prf')
| -rw-r--r-- | mkspecs/features/resources_functions.prf | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf index 9b0086596d..b525f482ca 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) { @@ -115,7 +113,7 @@ defineTest(qtEnsurePluginResourcesCpp) { RESOURCE_INIT_CONT = \ "// This file is autogenerated by qmake. It contains a function that" \ "// references all resources the plugin includes and the function is" \ - "// referenced by Qt_(MOC_)EXPORT_PLUGIN to ensure the inclusion in" \ + "// referenced by QT_(MOC_)EXPORT_PLUGIN to ensure the inclusion in" \ "// the statically linked plugin." \ "$${LITERAL_HASH}include <QtCore/qglobal.h>" \ "void $${resource_init_function}() " \ |