From 42aa740df72af0c14f19a498f779d130e8303e54 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Tue, 10 Dec 2019 09:00:11 +0100
Subject: rcc: Fix namespace handling for initializer

rcc currently always writes the namespace mangling macros in both the
initializer constructor and destructor. This patch add the missing
handling of the --namespace option for that part of the generated code.

[ChangeLog][Tools][rcc] rcc now generates correct code when using the
--namespace option.

Change-Id: I7e5e608eb0ad267d11d601fc69c1a87d3f655a6e
Fixes: QTBUG-80649
Reviewed-by: hjk <hjk@qt.io>
---
 src/tools/rcc/rcc.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/tools/rcc/rcc.cpp')

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 9acbce25ff..7185219d34 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -1478,13 +1478,19 @@ bool RCCResourceLibrary::writeInitializer()
         writeString("    return 1;\n");
         writeString("}\n\n");
 
-        writeByteArray(
-                    "namespace {\n"
-                  "   struct initializer {\n"
-                  "       initializer() { QT_RCC_MANGLE_NAMESPACE(" + initResources + ")(); }\n"
-                  "       ~initializer() { QT_RCC_MANGLE_NAMESPACE(" + cleanResources + ")(); }\n"
-                  "   } dummy;\n"
-                  "}\n");
+
+        writeString("namespace {\n"
+                    "   struct initializer {\n");
+
+        if (m_useNameSpace) {
+            writeByteArray("       initializer() { QT_RCC_MANGLE_NAMESPACE(" + initResources + ")(); }\n"
+                           "       ~initializer() { QT_RCC_MANGLE_NAMESPACE(" + cleanResources + ")(); }\n");
+        } else {
+            writeByteArray("       initializer() { " + initResources + "(); }\n"
+                           "       ~initializer() { " + cleanResources + "(); }\n");
+        }
+        writeString("   } dummy;\n"
+                    "}\n");
 
     } else if (m_format == Binary) {
         int i = 4;
-- 
cgit v1.2.3


From c7e35ffe69a73bb144618714313673f0d0c28394 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 26 Nov 2018 09:55:00 +0100
Subject: Use a QMultiHash explicitly if insertMulti() is being used

This is a step towards deprecating QHash::insertMulti() and clearly
separating QHash and QMultiHash.

Change-Id: Ic2c7665673ff00d4f2186e94850710b70330f8ba
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/tools/rcc/rcc.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/tools/rcc/rcc.cpp')

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 7185219d34..7188c81300 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -129,7 +129,7 @@ public:
     QLocale::Country m_country;
     QFileInfo m_fileInfo;
     RCCFileInfo *m_parent;
-    QHash<QString, RCCFileInfo*> m_children;
+    QMultiHash<QString, RCCFileInfo *> m_children;
     RCCResourceLibrary::CompressionAlgorithm m_compressAlgo;
     int m_compressLevel;
     int m_compressThreshold;
@@ -737,7 +737,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
             parent->m_children.insert(node, s);
             parent = s;
         } else {
-            parent = parent->m_children[node];
+            parent = *parent->m_children.constFind(node);
         }
     }
 
@@ -757,7 +757,7 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
             break;
         }
     }
-    parent->m_children.insertMulti(filename, s);
+    parent->m_children.insert(filename, s);
     return true;
 }
 
-- 
cgit v1.2.3