diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-06 16:01:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-09 08:22:04 +0000 |
| commit | 6f59c91c51edd7207635c3fa2f0b2b1179e7aa6e (patch) | |
| tree | 7586953bcb0103fc16c6f0054cde68784c3fd30c /src/qml/qml/qqmlimport.cpp | |
| parent | 1372a773e1acc88d454beab850a6e88c4c359d7b (diff) | |
Revert parts of 392c7b99348e2a96ef11adb5712095fbd13fb780
Revert the plugin loading check for Qt 5.6.x. It turns out that making this
check strict broke multiple static plugin builds beyond the qtdeclarative
repository. Let's not cause unnecessary breakage in a patch release of Qt to
fix a bug that has existed for much longer.
I'll revert this change in the dev branch for Qt 5.8, together with an entry in
the change log to inform the developers that a behavioral change in their code
is necessary (the use of the interface id variable).
Change-Id: I3c658433eaa125ac0d272806e3bbbf016cf6d3cb
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 9fc01c8e35..c4e0c7b778 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -850,7 +850,7 @@ bool QQmlImportsPrivate::populatePluginPairVector(QVector<StaticPluginPair> &res // To avoid traversing all static plugins for all imports, we cut down // the list the first time called to only contain QML plugins: foreach (const QStaticPlugin &plugin, QPluginLoader::staticPlugins()) { - if (plugin.metaData().value(QStringLiteral("IID")).toString() == QLatin1String(QQmlExtensionInterface_iid)) + if (qobject_cast<QQmlExtensionPlugin *>(plugin.instance())) plugins.append(plugin); } } |