diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-12 11:53:31 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-26 08:22:59 +0000 |
| commit | b150dd6c60d7acf6a3c68078283700be8b604a96 (patch) | |
| tree | 1936ab0edc5ca48f5dbe502b22e783a172ea2d8d /src/qml/debugger/qqmlinspectorservice.cpp | |
| parent | ddd8bba3e28ce6bc4b26b906fed977b4de2ab1f0 (diff) | |
Load inspector plugin by IID, instead of blacklisting file names.
The previous approach only works with a very limited number of
available plugins.
Change-Id: I8515c7f329d6a2fb5ddbf7d91ac61b4ce0c4e550
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmlinspectorservice.cpp')
| -rw-r--r-- | src/qml/debugger/qqmlinspectorservice.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmlinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp index 37c7032f86..0bc1257b75 100644 --- a/src/qml/debugger/qqmlinspectorservice.cpp +++ b/src/qml/debugger/qqmlinspectorservice.cpp @@ -153,12 +153,14 @@ void QQmlInspectorService::loadInspectorPlugins() } foreach (const QString &pluginPath, pluginCandidates) { - if (pluginPath.contains(QLatin1String("qmldbg_tcp"))) - continue; if (qmlDebugVerbose()) qDebug() << "QQmlInspector: Trying to load plugin " << pluginPath << "..."; QPluginLoader loader(pluginPath); + if (loader.metaData()[QLatin1String("IID")] != + QLatin1String("org.qt-project.Qt.QQmlInspectorInterface")) + continue; + if (!loader.load()) { if (qmlDebugVerbose()) qDebug() << "QQmlInspector: Error while loading: " << loader.errorString(); |