Move composite types into QQmlMetaType

This way we can retrieve them without an engine. Since we construct a
new QMetaTypeInterface for each composite type we load, those
QMetaTypeInterfaces will still be unique even if the same type is used
in different engines. Therefore, we can store them all in the same
container.

This exposes the fact that we don't actually register composite types as
"custom" QMetaTypes in registerInternalCompositeType(), but we expect
them to be registered later on, in particular in
unregisterInternalCompositeType(). Retrieve the IDs once, in order to
have the types registered right away.

Change-Id: Ib8e875a5c950f105996877ea597a6de2b01aa1f5
Reviewed-by: Fabian Kosmale <[email protected]>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h
index e4670553cb..962517f6f4 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit_p.h
+++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h
@@ -181,7 +181,7 @@ public:
     CompositeMetaTypeIds typeIdsForComponent(int objectid = 0) const;
 
     CompositeMetaTypeIds typeIds;
-    bool isRegisteredWithEngine = false;
+    bool isRegistered = false;
 
     QHash<int, InlineComponentData> inlineComponentData;