Do proper memory management on the metatype interfaces we create

Those interfaces are always registered in pairs. Add an external
refcount to CompositeMetaTypeIds, and do registration and
de-registration through this class.

Change-Id: I4f3a53ad935a43a734d6506ffc768f507b48ee1f
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 1 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp
index 9d8332ea55..01700fd05c 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit.cpp
+++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp
@@ -303,7 +303,6 @@ void ExecutableCompilationUnit::unlink()
         if (qmlEngine)
             qmlEngine->unregisterInternalCompositeType(this);
         isRegisteredWithEngine = false;
-        QQmlMetaType::unregisterInternalCompositeType(typeIds);
     }
 
     propertyCaches.clear();
@@ -410,7 +409,7 @@ void ExecutableCompilationUnit::finalizeCompositeType(QQmlEnginePrivate *qmlEngi
     if (propertyCaches.needsVMEMetaObject(/*root object*/0)) {
         // typeIds is only valid for types that have references to themselves.
         if (!types.isValid())
-            types = QQmlMetaType::registerInternalCompositeType(rootPropertyCache()->className());
+            types = CompositeMetaTypeIds::fromCompositeName(rootPropertyCache()->className());
         typeIds = types;
         qmlEngine->registerInternalCompositeType(this);