diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-11 17:57:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-19 15:25:07 +0000 |
| commit | 3df1aae3a522a99fba2a6a22ded01529f9a9c4da (patch) | |
| tree | 956011a4815668c44813da887613af9c06e4ba76 /src/qml/qml/qqmlmetatype.cpp | |
| parent | 9fd6ccb582166b684550a5805e895292302b4e12 (diff) | |
Don't try to load (or unload) QML plugins if QT_NO_LIBRARY
Most of the code already has those #ifdefs, so let's add the missing
ones.
Change-Id: I2a46d5ab660daa837d9ce432184d0b55818a5dc1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlmetatype.cpp')
| -rw-r--r-- | src/qml/qml/qqmlmetatype.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp index 249ce6942f..55df65e607 100644 --- a/src/qml/qml/qqmlmetatype.cpp +++ b/src/qml/qml/qqmlmetatype.cpp @@ -1107,7 +1107,9 @@ void qmlClearTypeRegistrations() // Declared in qqml.h data->uriToModule.clear(); QQmlEnginePrivate::baseModulesUninitialized = true; //So the engine re-registers its types +#ifndef QT_NO_LIBRARY qmlClearEnginePlugins(); +#endif } int registerAutoParentFunction(QQmlPrivate::RegisterAutoParent &autoparent) |