Move property caches from QQmlCompiledData to QV4::CompiledData::CompilationUnit

This makes particularly sense as the binding property data per object that
allows us to avoid a by-name property lookup when instantiating types is also
stored there.

Change-Id: I4d9275c1d8fde252df83eb11a9dfea71e5e9583a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/qml/qml/qqmlcompileddata.cpp b/src/qml/qml/qqmlcompileddata.cpp
index 1037b5da51..0305f3605f 100644
--- a/src/qml/qml/qqmlcompileddata.cpp
+++ b/src/qml/qml/qqmlcompileddata.cpp
@@ -91,10 +91,6 @@ QQmlCompiledData::~QQmlCompiledData()
 
     if (importCache)
         importCache->release();
-
-    for (int ii = 0; ii < propertyCaches.count(); ++ii)
-        if (propertyCaches.at(ii).data())
-            propertyCaches.at(ii)->release();
 }
 
 void QQmlCompiledData::clear()
@@ -109,7 +105,7 @@ QQmlPropertyCache *QQmlCompiledData::TypeReference::propertyCache() const
     if (type)
         return typePropertyCache;
     else
-        return component->rootPropertyCache();
+        return component->compilationUnit->rootPropertyCache();
 }
 
 /*!
@@ -124,7 +120,7 @@ QQmlPropertyCache *QQmlCompiledData::TypeReference::createPropertyCache(QQmlEngi
         typePropertyCache->addref();
         return typePropertyCache;
     } else {
-        return component->rootPropertyCache();
+        return component->compilationUnit->rootPropertyCache();
     }
 }
 
@@ -146,7 +142,7 @@ void QQmlCompiledData::TypeReference::doDynamicTypeCheck()
     else if (type)
         mo = type->metaObject();
     else if (component)
-        mo = component->rootPropertyCache()->firstCppMetaObject();
+        mo = component->compilationUnit->rootPropertyCache()->firstCppMetaObject();
     isFullyDynamicType = qtTypeInherits<QQmlPropertyMap>(mo);
 }