1 files changed, 20 insertions, 2 deletions
diff --git a/src/qml/qml/qqml.cpp b/src/qml/qml/qqml.cpp
index c1a8ed2a3d..613816e3f7 100644
--- a/src/qml/qml/qqml.cpp
+++ b/src/qml/qml/qqml.cpp
@@ -55,9 +55,7 @@ void qmlClearTypeRegistrations() // Declared in qqml.h
 {
     QQmlMetaType::clearTypeRegistrations();
     QQmlEnginePrivate::baseModulesUninitialized = true; //So the engine re-registers its types
-#if QT_CONFIG(library)
     qmlClearEnginePlugins();
-#endif
 }
 
 //From qqml.h
@@ -113,4 +111,24 @@ int QQmlPrivate::qmlregister(RegistrationType type, void *data)
     return dtype.index();
 }
 
+void QQmlPrivate::qmlunregister(RegistrationType type, quintptr data)
+{
+    switch (type) {
+    case AutoParentRegistration:
+        QQmlMetaType::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:
+        QQmlMetaType::unregisterType(data);
+        break;
+    }
+}
+
 QT_END_NAMESPACE