Qt Designer: Update copied rcc-code to contain the correct hash function.

This fixes icons not showing in the resource editor or style sheets.

See qtbase:ddb70bee2fd323ddc4273aec5d40d975f50d2904

Change-Id: I7c21dd738c1b75fbe071685dfb89f43a79c49ff9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/designer/src/lib/shared/rcc.cpp b/src/designer/src/lib/shared/rcc.cpp
index d336687..945960f 100644 (file)
--- a/src/designer/src/lib/shared/rcc.cpp
+++ b/src/designer/src/lib/shared/rcc.cpp
@@ -298,7 +298,7 @@ qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset)
     offset += 2;
 
     // write the hash
-    lib.writeNumber4(qHash(m_name));
+    lib.writeNumber4(qt_hash(m_name));
     if (text)
         lib.writeString("\n  ");
     offset += 4;
@@ -882,7 +882,7 @@ bool RCCResourceLibrary::writeDataNames()
 
 static bool qt_rcc_compare_hash(const RCCFileInfo *left, const RCCFileInfo *right)
 {
-    return qHash(left->m_name) < qHash(right->m_name);
+    return qt_hash(left->m_name) < qt_hash(right->m_name);
 }
 
 bool RCCResourceLibrary::writeDataStructure()