1 files changed, 8 insertions, 2 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp
index 98056aa551..dde0b7207a 100644
--- a/src/imports/qtquick2/plugin.cpp
+++ b/src/imports/qtquick2/plugin.cpp
@@ -50,7 +50,12 @@ class QtQuick2Plugin : public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
-    QtQuick2Plugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
+    QtQuick2Plugin(QObject *parent = nullptr) : QQmlExtensionPlugin(parent)
+    {
+        volatile auto registration = &qml_register_types_QtQuick;
+        Q_UNUSED(registration);
+    }
+
     void registerTypes(const char *uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick"));
@@ -59,10 +64,11 @@ public:
         QQmlQtQuick2Module::defineModule();
     }
 
-    ~QtQuick2Plugin() override
+    void unregisterTypes() override
     {
         if (moduleDefined)
             QQmlQtQuick2Module::undefineModule();
+        moduleDefined = false;
     }
 
     bool moduleDefined = false;