QtQml: Move ResolvedTypeReference into base CU

Change-Id: I25063457aad3a6d29a8c2a5b236f9a51b56a2f51
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 15 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h
index 11adcb79cd..d1504079b4 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit_p.h
+++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h
@@ -34,12 +34,6 @@ class QQmlEnginePrivate;
 namespace QV4 {
 
 class CompilationUnitMapper;
-class ResolvedTypeReference;
-// map from name index
-struct ResolvedTypeReferenceMap: public QHash<int, ResolvedTypeReference*>
-{
-    bool addToHash(QCryptographicHash *hash, QHash<quintptr, QByteArray> *checksums) const;
-};
 
 struct CompilationUnitRuntimeData
 {
@@ -113,9 +107,21 @@ public:
     int totalObjectCount() const;
 
     QVector<QQmlRefPointer<QQmlScriptData>> dependentScripts;
-    ResolvedTypeReferenceMap resolvedTypes;
-    ResolvedTypeReference *resolvedType(int id) const { return resolvedTypes.value(id); }
-    ResolvedTypeReference *resolvedType(QMetaType type) const;
+
+    ResolvedTypeReference *resolvedType(int id) const
+    {
+        return m_compilationUnit->resolvedType(id);
+    }
+
+    ResolvedTypeReference *resolvedType(QMetaType type) const
+    {
+        return m_compilationUnit->resolvedType(type);
+    }
+
+    void setResolvedTypes(const CompiledData::ResolvedTypeReferenceMap &resolvedTypes)
+    {
+        m_compilationUnit->resolvedTypes = resolvedTypes;
+    }
 
     bool verifyChecksum(const CompiledData::DependentTypesHasher &dependencyHasher) const;