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>

3 files changed, 74 insertions, 0 deletions

diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
index c6231fddd5..1488a4dfcf 100644
--- a/src/qml/debugger/debugger.pri
+++ b/src/qml/debugger/debugger.pri
@@ -20,6 +20,7 @@ HEADERS += \
     $$PWD/qqmldebugconnector_p.h \
     $$PWD/qqmldebugpluginmanager_p.h \
     $$PWD/qqmldebugservice_p.h \
+    $$PWD/qqmldebugservicefactory_p.h \
     $$PWD/qqmlprofilerservice_p.h \
     $$PWD/qqmldebugserviceinterfaces_p.h \
     $$PWD/qqmldebugstatesdelegate_p.h \
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());
+                }
+            }
         }
     }
 
diff --git a/src/qml/debugger/qqmldebugservicefactory_p.h b/src/qml/debugger/qqmldebugservicefactory_p.h
new file mode 100644
index 0000000000..af50cd4635
--- /dev/null
+++ b/src/qml/debugger/qqmldebugservicefactory_p.h
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLDEBUGSERVICEFACTORY_P_H
+#define QQMLDEBUGSERVICEFACTORY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qqmldebugservice_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugServiceFactory : public QObject
+{
+    Q_OBJECT
+public:
+    virtual QQmlDebugService *create(const QString &key) = 0;
+};
+
+#define QQmlDebugServiceFactory_iid "org.qt-project.Qt.QQmlDebugServiceFactory"
+
+QT_END_NAMESPACE
+
+#endif // QQMLDEBUGSERVICEFACTORY_P_H