diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-25 20:57:38 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-25 20:57:38 +0200 |
| commit | 48dce24717ca537a6f5d817b2f5cd689df86ad68 (patch) | |
| tree | 72c8cc3161f84b9d97bca5014f107d8190a58338 /src/imports | |
| parent | 8b7dbfe1e0c0d4b8d0984fb381f1a0bb6b566e76 (diff) | |
| parent | ec73b9ff3b0064cf7760baeb826d912d9a30d227 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I12efb77e812364052eca12ea35219ceff64d7cc3
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/qtquick2/plugin.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp index 4fb6907077..42454f0983 100644 --- a/src/imports/qtquick2/plugin.cpp +++ b/src/imports/qtquick2/plugin.cpp @@ -61,13 +61,17 @@ public: { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick")); Q_UNUSED(uri); + moduleDefined = true; QQmlQtQuick2Module::defineModule(); } ~QtQuick2Plugin() { - QQmlQtQuick2Module::undefineModule(); + if (moduleDefined) + QQmlQtQuick2Module::undefineModule(); } + + bool moduleDefined = false; }; //![class decl] |