1 files changed, 21 insertions, 4 deletions

diff --git a/mkspecs/features/resources_functions.prf b/mkspecs/features/resources_functions.prf
index f7fed9e524..b7a15fd1d9 100644
--- a/mkspecs/features/resources_functions.prf
+++ b/mkspecs/features/resources_functions.prf
@@ -1,5 +1,21 @@
+# http://www.w3.org/TR/xml/#syntax
+defineReplace(xml_escape) {
+    1 ~= s,&,&,
+    1 ~= s,\',',
+    1 ~= s,\",",
+    1 ~= s,<,&lt;,
+    1 ~= s,>,&gt;,
+    return($$1)
+}
+
 defineTest(qtFlattenResources) {
-    RESOURCES += qmake_immediate
+    immediate = qmake_immediate$$QMAKE_RESOURCES_IMMEDIATE_NR
+    defined(QMAKE_RESOURCES_IMMEDIATE_NR, var): \
+        QMAKE_RESOURCES_IMMEDIATE_NR = $$num_add($$QMAKE_RESOURCES_IMMEDIATE_NR, 1)
+    else: \
+        QMAKE_RESOURCES_IMMEDIATE_NR = 1
+
+    RESOURCES += $$immediate
     for(resource, RESOURCES) {
         # Regular case of user qrc file
         contains(resource, ".*\\.qrc$"): \
@@ -7,10 +23,10 @@ defineTest(qtFlattenResources) {
 
         # Fallback for stand-alone files/directories
         !defined($${resource}.files, var) {
-            !equals(resource, qmake_immediate) {
+            !equals(resource, $$immediate) {
                 !exists($$absolute_path($$resource, $$_PRO_FILE_PWD_)): \
                     warning("Failure to find: $$resource")
-                qmake_immediate.files += $$resource
+                $${immediate}.files += $$resource
                 OTHER_FILES *= $$resource
             }
             RESOURCES -= $$resource
@@ -56,8 +72,9 @@ defineTest(qtFlattenResources) {
         RESOURCES -= $$resource
         RESOURCES += $$resource_file
     }
+    export(QMAKE_RESOURCES_IMMEDIATE_NR)
     export(RESOURCES)
     export(OTHER_FILES)
-    export(qmake_immediate.files)
+    export($${immediate}.files)
     return(true)
 }