1 files changed, 2 insertions, 67 deletions

diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index fa8ff1fb58..cee0981db0 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -6,73 +6,8 @@ isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc
 !contains(QMAKE_RESOURCE_FLAGS, -root):!isEmpty(QMAKE_RESOURCE_ROOT):QMAKE_RESOURCE_FLAGS += -root $$QMAKE_RESOURCE_ROOT
 !contains(QMAKE_RESOURCE_FLAGS, -name): QMAKE_RESOURCE_FLAGS += -name ${QMAKE_FILE_BASE}
 
-# http://www.w3.org/TR/xml/#syntax
-defineReplace(xml_escape) {
-    1 ~= s,&,&,
-    1 ~= s,\',',
-    1 ~= s,\",",
-    1 ~= s,<,&lt;,
-    1 ~= s,>,&gt;,
-    return($$1)
-}
-
-RESOURCES += qmake_immediate
-for(resource, RESOURCES) {
-    # Regular case of user qrc file
-    contains(resource, ".*\\.qrc$"): \
-        next()
-
-    # Fallback for stand-alone files/directories
-    !defined($${resource}.files, var) {
-        !equals(resource, qmake_immediate) {
-            !exists($$absolute_path($$resource, $$_PRO_FILE_PWD_)): \
-                warning("Failure to find: $$resource")
-            qmake_immediate.files += $$resource
-            OTHER_FILES *= $$resource
-        }
-        RESOURCES -= $$resource
-        next()
-    }
-
-    resource_file = $$absolute_path($$RCC_DIR/qmake_$${resource}.qrc, $$OUT_PWD)
-
-    isEmpty(BUILDS)|build_pass {
-        # Collection of files, generate qrc file
-        prefix = $$eval($${resource}.prefix)
-        isEmpty(prefix): \
-            prefix = "/"
-
-        resource_file_content = \
-            "<!DOCTYPE RCC><RCC version=\"1.0\">" \
-            "<qresource prefix=\"$$xml_escape($$prefix)\">"
-
-        abs_base = $$absolute_path($$eval($${resource}.base), $$_PRO_FILE_PWD_)
-
-        for(file, $${resource}.files) {
-            abs_path = $$absolute_path($$file, $$_PRO_FILE_PWD_)
-            files = $$files($$abs_path/*, true)
-            isEmpty(files): \
-                files = $$abs_path
-            for (file, files) {
-                exists($$file/*): next()  # exclude directories
-                alias = $$relative_path($$file, $$abs_base)
-                resource_file_content += \
-                    "<file alias=\"$$xml_escape($$alias)\">$$xml_escape($$file)</file>"
-                OTHER_FILES *= $$file
-            }
-        }
-
-        resource_file_content += \
-            "</qresource>" \
-            "</RCC>"
-
-        !write_file($$resource_file, resource_file_content): \
-            error()
-    }
-
-    RESOURCES -= $$resource
-    RESOURCES += $$resource_file
-}
+load(resources_functions)
+qtFlattenResources()
 
 !isEmpty(RESOURCES):contains(TEMPLATE, .*lib):plugin:static {
     pluginBaseName = $$basename(TARGET)