Unregister types in the QMetaType system on unload.

This patch will enable the unregistering of previously registered
QMetaTypes, when the corresponding Qml type is dead.
The API for this was added to QtBase with b00201b.

Change-Id: I96d4a3004d8da59ee8edf7cfd6d2fef3a5410807
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 70090bd3f9..2361274e5f 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -617,8 +617,14 @@ QQmlEnginePrivate::~QQmlEnginePrivate()
 
     for (TypePropertyCacheIt iter = typePropertyCache.begin(), end = typePropertyCache.end(); iter != end; ++iter)
         (*iter)->release();
-    for (CompositeTypesIt iter = m_compositeTypes.begin(), end = m_compositeTypes.end(); iter != end; ++iter)
+    for (CompositeTypesIt iter = m_compositeTypes.begin(), end = m_compositeTypes.end(); iter != end; ++iter) {
         iter.value()->isRegisteredWithEngine = false;
+
+        // since unregisterInternalCompositeType() will not be called in this
+        // case, we have to clean up the type registration manually
+        QMetaType::unregisterType(iter.value()->metaTypeId);
+        QMetaType::unregisterType(iter.value()->listMetaTypeId);
+    }
     delete profiler;
 }
 
@@ -2311,6 +2317,9 @@ void QQmlEnginePrivate::unregisterInternalCompositeType(QQmlCompiledData *data)
     Locker locker(this);
     m_qmlLists.remove(lst_type);
     m_compositeTypes.remove(ptr_type);
+
+    QMetaType::unregisterType(ptr_type);
+    QMetaType::unregisterType(lst_type);
 }
 
 bool QQmlEnginePrivate::isTypeLoaded(const QUrl &url) const