aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/debugger/qqmldebugconnector.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/debugger/qqmldebugconnector.cpp')
-rw-r--r--src/qml/debugger/qqmldebugconnector.cpp10
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());
+ }
+ }
}
}