QtQml: Move type name cache into base CU

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

1 files changed, 15 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h
index b4d3e413c1..3d9b32d354 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit_p.h
+++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h
@@ -15,14 +15,15 @@
 // We mean it.
 //
 
-#include <private/qv4compileddata_p.h>
-#include <private/qv4identifierhash_p.h>
-#include <private/qqmlrefcount_p.h>
 #include <private/qintrusivelist_p.h>
+#include <private/qqmlmetatype_p.h>
+#include <private/qqmlnullablevalue_p.h>
 #include <private/qqmlpropertycachevector_p.h>
+#include <private/qqmlrefcount_p.h>
 #include <private/qqmltype_p.h>
-#include <private/qqmlnullablevalue_p.h>
-#include <private/qqmlmetatype_p.h>
+#include <private/qqmltypenamecache_p.h>
+#include <private/qv4compileddata_p.h>
+#include <private/qv4identifierhash_p.h>
 
 #include <memory>
 
@@ -78,7 +79,15 @@ public:
     QUrl url() const { return m_compilationUnit->url(); }
     QUrl finalUrl() const { return m_compilationUnit->finalUrl(); }
 
-    QQmlRefPointer<QQmlTypeNameCache> typeNameCache;
+    QQmlRefPointer<QQmlTypeNameCache> typeNameCache() const
+    {
+        return m_compilationUnit->typeNameCache;
+    }
+
+    void setTypeNameCache(const QQmlRefPointer<QQmlTypeNameCache> &typeNameCache)
+    {
+        m_compilationUnit->typeNameCache = typeNameCache;
+    }
 
     const QQmlPropertyCacheVector *propertyCachesPtr() const
     {