From c5777ad81cf395dfebbe46c629caca2b933d8008 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Wed, 27 Nov 2019 14:52:32 +0100
Subject: Fix calls to qtFlattenResources from outside resources.prf

The xml_escape function must be part of resources_functions.prf, and the
qmake_immediate resource must not be created multiple times. Instead,
create another qmake_immediate resource with a number suffix.

This commit amends 577b6554.

Task-number: QTBUG-79672
Change-Id: Ibbe20c0fd1940f1fe7733cd1e5b0891f65689782
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 mkspecs/features/resources.prf | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'mkspecs/features/resources.prf')

diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index ca95768de8..cee0981db0 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -6,16 +6,6 @@ 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,&,&amp;,
-    1 ~= s,\',&apos;,
-    1 ~= s,\",&quot;,
-    1 ~= s,<,&lt;,
-    1 ~= s,>,&gt;,
-    return($$1)
-}
-
 load(resources_functions)
 qtFlattenResources()
 
-- 
cgit v1.2.3