1 files changed, 6 insertions, 1 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp
index b4caf01d10..71e2fa7ec0 100644
--- a/src/imports/qtquick2/plugin.cpp
+++ b/src/imports/qtquick2/plugin.cpp
@@ -43,17 +43,22 @@ class QtQuick2Plugin : public QQmlExtensionPlugin
     Q_OBJECT
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 public:
+    QtQuick2Plugin() : moduleDefined(false) {}
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick"));
         Q_UNUSED(uri);
+        moduleDefined = true;
         QQmlQtQuick2Module::defineModule();
     }
 
     ~QtQuick2Plugin()
     {
-        QQmlQtQuick2Module::undefineModule();
+        if (moduleDefined)
+            QQmlQtQuick2Module::undefineModule();
     }
+
+    bool moduleDefined;
 };
 //![class decl]