From 54ee6994e66936c1d532f7718c858c9b18e3c91d Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Thu, 28 Jul 2016 17:40:32 +0200
Subject: Add a checksum to the generated QML compilation units

Change-Id: Icd5b1d805059981cbbb4c0eb2a5c842d59223839
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/qml/qml/qqmltypeloader_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/qml/qml/qqmltypeloader_p.h')

diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index ab6b046fcf..5f754df1fc 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -463,7 +463,9 @@ private:
     QList<TypeReference> m_compositeSingletons;
 
     // map from name index to resolved type
-    QHash<int, TypeReference> m_resolvedTypes;
+    // While this could be a hash, a map is chosen here to provide a stable
+    // order, which is used to calculating a check-sum on dependent meta-objects.
+    QMap<int, TypeReference> m_resolvedTypes;
     bool m_typesResolved:1;
 
     QQmlRefPointer<QV4::CompiledData::CompilationUnit> m_compiledData;
-- 
cgit v1.2.3