Move propertyCache- and metaObject-related functions into QQmlMetaType

That's where the data resides. This allows us to lock the mutex only
once for all those methods, and it makes a large number of engine
pointers unnecessary.

Finally, we can now find the element type of a QQmlListProperty without
supplying an engine.

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

1 files changed, 4 insertions, 7 deletions

diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp
index 59922be564..98eb7e40c3 100644
--- a/src/qml/qml/qqml.cpp
+++ b/src/qml/qml/qqml.cpp
@@ -869,12 +869,8 @@ static bool initObjectLookup(
 
         const QMetaObject *typeMetaObject = type.metaObject();
         const QMetaObject *foundMetaObject = propType.metaObject();
-        if (!foundMetaObject) {
-            if (QQmlEngine *engine = aotContext->qmlEngine()) {
-                foundMetaObject = QQmlEnginePrivate::get(engine)->metaObjectForType(
-                            propType).metaObject();
-            }
-        }
+        if (!foundMetaObject)
+            foundMetaObject = QQmlMetaType::metaObjectForType(propType).metaObject();
 
         while (foundMetaObject) {
             if (foundMetaObject == typeMetaObject)
@@ -1318,7 +1314,8 @@ bool AOTCompiledContext::loadTypeLookup(uint index, void *target) const
                 ->compilationUnit()->typeIds.id;
     }
 
-    *static_cast<const QMetaObject **>(target) = ep->metaObjectForType(metaType).metaObject();
+    *static_cast<const QMetaObject **>(target)
+            = QQmlMetaType::metaObjectForType(metaType).metaObject();
     return true;
 }