Merge remote-tracking branch 'origin/dev' into new-backend

Change-Id: I1a49b4a242ed0764101521d06ec612e96bff0e4c

5 files changed, 281 insertions, 8 deletions

diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
index da1ab867d4..b8d2347b17 100644
--- a/src/qml/debugger/debugger.pri
+++ b/src/qml/debugger/debugger.pri
@@ -3,8 +3,11 @@ contains(QT_CONFIG, no-qml-debug) {
     MODULE_DEFINES += QT_NO_QML_DEBUGGER
 } else {
     HEADERS += \
+        $$PWD/qqmlconfigurabledebugservice_p.h \
         $$PWD/qqmldebugpluginmanager_p.h \
-        $$PWD/qqmldebugservicefactory_p.h
+        $$PWD/qqmldebugservicefactory_p.h \
+        $$PWD/qqmldebugserver_p.h \
+        $$PWD/qqmldebugserverconnection_p.h
 
     SOURCES += \
         $$PWD/qqmldebug.cpp \
diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p.h
new file mode 100644
index 0000000000..e09d5f779a
--- /dev/null
+++ b/src/qml/debugger/qqmlconfigurabledebugservice_p.h
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#ifndef QQMLCONFIGURABLEDEBUGSEVICE_P_H
+#define QQMLCONFIGURABLEDEBUGSEVICE_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"
+#include "qqmldebugconnector_p.h"
+
+#include <QtCore/qmutex.h>
+
+QT_BEGIN_NAMESPACE
+
+template <class Base>
+class QQmlConfigurableDebugService : public Base
+{
+protected:
+    QQmlConfigurableDebugService(float version, QObject *parent = 0) :
+        Base(version, parent), m_configMutex(QMutex::Recursive)
+    {
+        init();
+    }
+
+    void stopWaiting()
+    {
+        QMutexLocker lock(&m_configMutex);
+        m_waitingForConfiguration = false;
+        for (QJSEngine *engine : qAsConst(m_waitingEngines))
+            emit Base::attachedToEngine(engine);
+        m_waitingEngines.clear();
+    }
+
+    void init()
+    {
+        QMutexLocker lock(&m_configMutex);
+        // If we're not enabled or not blocking, don't wait for configuration
+        m_waitingForConfiguration = (Base::state() == QQmlDebugService::Enabled &&
+                                     QQmlDebugConnector::instance()->blockingMode());
+    }
+
+    void stateChanged(QQmlDebugService::State newState) override
+    {
+        if (newState != QQmlDebugService::Enabled)
+            stopWaiting();
+        else
+            init();
+    }
+
+    void engineAboutToBeAdded(QJSEngine *engine) override
+    {
+        QMutexLocker lock(&m_configMutex);
+        if (m_waitingForConfiguration)
+            m_waitingEngines.append(engine);
+        else
+            emit Base::attachedToEngine(engine);
+    }
+
+    QMutex m_configMutex;
+    QList<QJSEngine *> m_waitingEngines;
+    bool m_waitingForConfiguration;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLCONFIGURABLEDEBUGSEVICE_P_H
diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h
new file mode 100644
index 0000000000..e848b00bda
--- /dev/null
+++ b/src/qml/debugger/qqmldebugserver_p.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLDEBUGSERVER_P_H
+#define QQMLDEBUGSERVER_P_H
+
+#include "qqmldebugconnector_p.h"
+
+#include <private/qtqmlglobal_p.h>
+#include <QtCore/QIODevice>
+
+//
+//  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.
+//
+
+QT_BEGIN_NAMESPACE
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugServer : public QQmlDebugConnector
+{
+    Q_OBJECT
+public:
+    virtual void setDevice(QIODevice *socket) = 0;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLDEBUGSERVER_P_H
diff --git a/src/qml/debugger/qqmldebugserverconnection_p.h b/src/qml/debugger/qqmldebugserverconnection_p.h
new file mode 100644
index 0000000000..536ad830b4
--- /dev/null
+++ b/src/qml/debugger/qqmldebugserverconnection_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLDEBUGSERVERCONNECTION_P_H
+#define QQMLDEBUGSERVERCONNECTION_P_H
+
+#include <private/qtqmlglobal_p.h>
+#include <QtCore/qobject.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.
+//
+
+QT_BEGIN_NAMESPACE
+
+class QQmlDebugServer;
+class Q_QML_PRIVATE_EXPORT QQmlDebugServerConnection : public QObject
+{
+    Q_OBJECT
+public:
+    QQmlDebugServerConnection(QObject *parent = 0) : QObject(parent) {}
+
+    virtual void setServer(QQmlDebugServer *server) = 0;
+    virtual bool setPortRange(int portFrom, int portTo, bool block, const QString &hostaddress) = 0;
+    virtual bool setFileName(const QString &fileName, bool block) = 0;
+    virtual bool isConnected() const = 0;
+    virtual void disconnect() = 0;
+    virtual void waitForConnection() = 0;
+    virtual void flush() = 0;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugServerConnectionFactory : public QObject
+{
+    Q_OBJECT
+public:
+    virtual QQmlDebugServerConnection *create(const QString &key) = 0;
+};
+
+#define QQmlDebugServerConnectionFactory_iid "org.qt-project.Qt.QQmlDebugServerConnectionFactory"
+Q_DECLARE_INTERFACE(QQmlDebugServerConnectionFactory, QQmlDebugServerConnectionFactory_iid)
+
+QT_END_NAMESPACE
+
+#endif // QQMLDEBUGSERVERCONNECTION_H
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
index 707ef1a937..12965ff383 100644
--- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h
+++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h
@@ -116,7 +116,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QV4DebugService(float version, QObject *parent = 0) :
+    QV4DebugService(float version, QObject *parent = nullptr) :
         QQmlDebugService(s_key, version, parent) {}
 };
 
@@ -138,7 +138,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QQmlProfilerService(float version, QObject *parent = 0) :
+    QQmlProfilerService(float version, QObject *parent = nullptr) :
         QQmlDebugService(s_key, version, parent) {}
 };
 
@@ -154,7 +154,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QQmlEngineDebugService(float version, QObject *parent = 0) :
+    QQmlEngineDebugService(float version, QObject *parent = nullptr) :
         QQmlDebugService(s_key, version, parent) {}
 
     QQmlBoundSignal *nextSignal(QQmlBoundSignal *prev) { return prev->m_nextSignal; }
@@ -173,7 +173,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QQmlInspectorService(float version, QObject *parent = 0) :
+    QQmlInspectorService(float version, QObject *parent = nullptr) :
         QQmlDebugService(s_key, version, parent) {}
 };
 
@@ -188,7 +188,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QDebugMessageService(float version, QObject *parent = 0) :
+    QDebugMessageService(float version, QObject *parent = nullptr) :
         QQmlDebugService(s_key, version, parent) {}
 };
 
@@ -201,7 +201,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QQmlEngineControlService(float version, QObject *parent = 0) :
+    QQmlEngineControlService(float version, QObject *parent = nullptr) :
         QQmlDebugService(s_key, version, parent) {}
 
 };
@@ -215,7 +215,7 @@ public:
 protected:
     friend class QQmlDebugConnector;
 
-    QQmlNativeDebugService(float version, QObject *parent = 0)
+    QQmlNativeDebugService(float version, QObject *parent = nullptr)
         : QQmlDebugService(s_key, version,  parent) {}
 };