Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I59343fe228ca6b823b61577e5a0907e7381899c2

1 files changed, 28 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 29b19b433f..0f8a850584 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -1641,7 +1641,14 @@ void qmlClearTypeRegistrations() // Declared in qqml.h
 #endif
 }
 
-static int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent)
+static void unregisterAutoParentFunction(const QQmlPrivate::AutoParentFunction &function)
+{
+    QMutexLocker lock(metaTypeDataLock());
+    QQmlMetaTypeData *data = metaTypeData();
+    data->parentFunctions.removeOne(function);
+}
+
+static int registerAutoParentFunction(const QQmlPrivate::RegisterAutoParent &autoparent)
 {
     QMutexLocker lock(metaTypeDataLock());
     QQmlMetaTypeData *data = metaTypeData();
@@ -1950,6 +1957,26 @@ int QQmlPrivate::qmlregister(RegistrationType type, void *data)
     return dtype.index();
 }
 
+void QQmlPrivate::qmlunregister(RegistrationType type, quintptr data)
+{
+    switch (type) {
+        case AutoParentRegistration:
+            unregisterAutoParentFunction(reinterpret_cast<AutoParentFunction>(data));
+            break;
+        case QmlUnitCacheHookRegistration:
+            QQmlMetaType::removeCachedUnitLookupFunction(
+                    reinterpret_cast<QmlUnitCacheLookupFunction>(data));
+            break;
+        case TypeRegistration:
+        case InterfaceRegistration:
+        case SingletonRegistration:
+        case CompositeRegistration:
+        case CompositeSingletonRegistration:
+            qmlUnregisterType(data);
+            break;
+    }
+}
+
 //From qqml.h
 bool qmlProtectModule(const char *uri, int majVersion)
 {