diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-15 16:17:26 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:34:57 +0000 |
| commit | 183eae3cbcb3c5c99d97fdc38f9dba7ea87cf05f (patch) | |
| tree | ad82a0a19589ceb3218282a3953baceeb8202b5e /src/qml/debugger/qqmldebugconnector.cpp | |
| parent | 07f19d36347d69c330e092e3cb4fc351a8815d5c (diff) | |
Add a factory for QQmlDebugService and use it to load plugins
Debug services can now be added as plugins in qmltooling/ .
QQmlDebugConnector will load any service plugins matching the factory's
iid before open()'ing the connector.
Change-Id: I2e4cabd714018f62cf4d60b0ebd2827a85431964
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugconnector.cpp')
| -rw-r--r-- | src/qml/debugger/qqmldebugconnector.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp index b14ada6a62..72754ec15a 100644 --- a/src/qml/debugger/qqmldebugconnector.cpp +++ b/src/qml/debugger/qqmldebugconnector.cpp @@ -39,10 +39,12 @@ #include "qqmlinspectorservice_p.h" #include "qqmlprofilerservice_p.h" #include "qv4debugservice_p.h" +#include "qqmldebugservicefactory_p.h" #include <QtCore/QPluginLoader> #include <QtCore/QCoreApplication> #include <QtCore/QDir> #include <QtCore/QDebug> +#include <QtCore/QJsonArray> #include <private/qcoreapplication_p.h> #include <private/qqmlengine_p.h> @@ -53,6 +55,7 @@ QT_BEGIN_NAMESPACE Q_QML_DEBUG_PLUGIN_LOADER(QQmlDebugConnector) Q_QML_IMPORT_DEBUG_PLUGIN(QQmlDebugServerFactory) +Q_QML_DEBUG_PLUGIN_LOADER(QQmlDebugService) struct QQmlDebugConnectorParams { QString pluginKey; QString arguments; @@ -121,6 +124,13 @@ QQmlDebugConnector *QQmlDebugConnector::instance() QDebugMessageService::instance(); QQmlEngineControlService::instance(); QQmlInspectorServiceImpl::instance(); + + foreach (const QJsonObject &object, metaDataForQQmlDebugService()) { + foreach (const QJsonValue &key, object.value(QLatin1String("MetaData")).toObject() + .value(QLatin1String("Keys")).toArray()) { + loadQQmlDebugService(key.toString()); + } + } } } |