Merge branch '1.21' into master

Change-Id: Ia540ffdfbcb1e51146dba53337defd09ded66f1a

1 files changed, 3 insertions, 2 deletions

diff --git a/src/lib/corelib/language/scriptengine.h b/src/lib/corelib/language/scriptengine.h
index 2c8aca241..68e346b68 100644
--- a/src/lib/corelib/language/scriptengine.h
+++ b/src/lib/corelib/language/scriptengine.h
@@ -47,6 +47,7 @@
 #include <logging/logger.h>
 #include <tools/codelocation.h>
 #include <tools/filetime.h>
+#include <tools/porting.h>
 #include <tools/set.h>
 
 #include <QtCore/qdir.h>
@@ -313,11 +314,11 @@ private:
         const PropertyMapConstPtr m_propertyMap;
 
         friend bool operator==(const PropertyCacheKey &lhs, const PropertyCacheKey &rhs);
-        friend uint qHash(const ScriptEngine::PropertyCacheKey &k, uint seed);
+        friend QHashValueType qHash(const ScriptEngine::PropertyCacheKey &k, QHashValueType seed);
     };
 
     friend bool operator==(const PropertyCacheKey &lhs, const PropertyCacheKey &rhs);
-    friend uint qHash(const ScriptEngine::PropertyCacheKey &k, uint seed);
+    friend QHashValueType qHash(const ScriptEngine::PropertyCacheKey &k, QHashValueType seed);
 
     static std::mutex m_creationDestructionMutex;
     ScriptImporter *m_scriptImporter;