13 files changed, 304 insertions, 26 deletions
diff --git a/src/qmldebug/qmldebug.pro b/src/qmldebug/qmldebug.pro
index 2c1b71797d..0807482d23 100644
--- a/src/qmldebug/qmldebug.pro
+++ b/src/qmldebug/qmldebug.pro
@@ -9,6 +9,7 @@ SOURCES += \
     qqmldebugconnection.cpp \
     qqmldebugmessageclient.cpp \
     qqmlenginecontrolclient.cpp \
+    qqmlpreviewclient.cpp \
     qqmlprofilerclient.cpp \
     qqmlprofilerevent.cpp \
     qqmlprofilereventlocation.cpp \
@@ -22,6 +23,8 @@ HEADERS += \
     qqmldebugmessageclient_p.h \
     qqmlenginecontrolclient_p.h \
     qqmlenginecontrolclient_p_p.h \
+    qqmlpreviewclient_p.h \
+    qqmlpreviewclient_p_p.h \
     qqmlprofilerclient_p.h \
     qqmlprofilerclient_p_p.h \
     qqmlprofilerevent_p.h \
diff --git a/src/qmldebug/qqmldebugclient.cpp b/src/qmldebug/qqmldebugclient.cpp
index d412b7b267..03123cc6e0 100644
--- a/src/qmldebug/qqmldebugclient.cpp
+++ b/src/qmldebug/qqmldebugclient.cpp
@@ -117,11 +117,6 @@ QQmlDebugConnection *QQmlDebugClient::connection() const
     return d->connection;
 }
 
-void QQmlDebugClient::stateChanged(QQmlDebugClient::State state)
-{
-    Q_UNUSED(state);
-}
-
 void QQmlDebugClient::messageReceived(const QByteArray &message)
 {
     Q_UNUSED(message);
diff --git a/src/qmldebug/qqmldebugclient_p.h b/src/qmldebug/qqmldebugclient_p.h
index 723de5ee43..469b65d4a9 100644
--- a/src/qmldebug/qqmldebugclient_p.h
+++ b/src/qmldebug/qqmldebugclient_p.h
@@ -76,13 +76,14 @@ public:
 
     QQmlDebugConnection *connection() const;
 
+signals:
+    void stateChanged(State state);
+
 protected:
     QQmlDebugClient(QQmlDebugClientPrivate &dd);
 
 private:
     friend class QQmlDebugConnection;
-
-    virtual void stateChanged(State state);
     virtual void messageReceived(const QByteArray &message);
 };
 
diff --git a/src/qmldebug/qqmldebugconnection.cpp b/src/qmldebug/qqmldebugconnection.cpp
index 67bad8d812..4e087ee6db 100644
--- a/src/qmldebug/qqmldebugconnection.cpp
+++ b/src/qmldebug/qqmldebugconnection.cpp
@@ -259,7 +259,7 @@ QQmlDebugConnection::~QQmlDebugConnection()
     Q_D(QQmlDebugConnection);
     QHash<QString, QQmlDebugClient*>::iterator iter = d->plugins.begin();
     for (; iter != d->plugins.end(); ++iter)
-        iter.value()->stateChanged(QQmlDebugClient::NotConnected);
+        emit iter.value()->stateChanged(QQmlDebugClient::NotConnected);
 }
 
 int QQmlDebugConnection::currentDataStreamVersion() const
@@ -295,7 +295,7 @@ void QQmlDebugConnection::close()
 
         QHash<QString, QQmlDebugClient*>::iterator iter = d->plugins.begin();
         for (; iter != d->plugins.end(); ++iter)
-            iter.value()->stateChanged(QQmlDebugClient::NotConnected);
+            emit iter.value()->stateChanged(QQmlDebugClient::NotConnected);
     }
 
     if (d->device) {
diff --git a/src/qmldebug/qqmldebugmessageclient.cpp b/src/qmldebug/qqmldebugmessageclient.cpp
index a03c1f8af2..0892404194 100644
--- a/src/qmldebug/qqmldebugmessageclient.cpp
+++ b/src/qmldebug/qqmldebugmessageclient.cpp
@@ -58,11 +58,6 @@ QQmlDebugMessageClient::QQmlDebugMessageClient(QQmlDebugConnection *client)
 {
 }
 
-void QQmlDebugMessageClient::stateChanged(State state)
-{
-    emit newState(state);
-}
-
 void QQmlDebugMessageClient::messageReceived(const QByteArray &data)
 {
     QDataStream ds(data);
diff --git a/src/qmldebug/qqmldebugmessageclient_p.h b/src/qmldebug/qqmldebugmessageclient_p.h
index 75c70044e4..a2a7f28f81 100644
--- a/src/qmldebug/qqmldebugmessageclient_p.h
+++ b/src/qmldebug/qqmldebugmessageclient_p.h
@@ -71,15 +71,10 @@ class QQmlDebugMessageClient : public QQmlDebugClient
 public:
     explicit QQmlDebugMessageClient(QQmlDebugConnection *client);
 
-    virtual void stateChanged(State state) override;
     virtual void messageReceived(const QByteArray &) override;
 
 signals:
-    void newState(QQmlDebugClient::State);
     void message(QtMsgType, const QString &, const QQmlDebugContextInfo &);
-
-private:
-    Q_DISABLE_COPY(QQmlDebugMessageClient)
 };
 
 QT_END_NAMESPACE
diff --git a/src/qmldebug/qqmlenginecontrolclient.cpp b/src/qmldebug/qqmlenginecontrolclient.cpp
index 45d672d4bc..cdc724ef2f 100644
--- a/src/qmldebug/qqmlenginecontrolclient.cpp
+++ b/src/qmldebug/qqmlenginecontrolclient.cpp
@@ -98,8 +98,8 @@ void QQmlEngineControlClient::messageReceived(const QByteArray &data)
 {
     Q_D(QQmlEngineControlClient);
     QPacket stream(d->connection->currentDataStreamVersion(), data);
-    int message;
-    int id;
+    qint32 message;
+    qint32 id;
     QString name;
 
     stream >> message >> id;
@@ -150,7 +150,7 @@ void QQmlEngineControlClientPrivate::sendCommand(
 {
     Q_Q(QQmlEngineControlClient);
     QPacket stream(connection->currentDataStreamVersion());
-    stream << int(command) << engineId;
+    stream << static_cast<qint32>(command) << engineId;
     q->sendMessage(stream.data());
 }
 
diff --git a/src/qmldebug/qqmlpreviewclient.cpp b/src/qmldebug/qqmlpreviewclient.cpp
new file mode 100644
index 0000000000..fa040e226b
--- /dev/null
+++ b/src/qmldebug/qqmlpreviewclient.cpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 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$
+**
+****************************************************************************/
+
+
+#include "qqmlpreviewclient_p_p.h"
+#include <private/qpacket_p.h>
+
+#include <QtCore/qurl.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdir.h>
+#include <QtQml/qqmlfile.h>
+
+QT_BEGIN_NAMESPACE
+
+QQmlPreviewClient::QQmlPreviewClient(QQmlDebugConnection *connection)
+    : QQmlDebugClient(*(new QQmlPreviewClientPrivate(connection)))
+{
+}
+
+void QQmlPreviewClient::messageReceived(const QByteArray &message)
+{
+    QPacket packet(connection()->currentDataStreamVersion(), message);
+
+    qint8 command;
+    packet >> command;
+
+    if (command == Error) {
+        QString seviceError;
+        packet >> seviceError;
+        emit error(seviceError);
+        return;
+    }
+
+    Q_ASSERT(command == Request);
+
+    QString fileName;
+    packet >> fileName;
+    emit request(fileName);
+}
+
+void QQmlPreviewClient::sendDirectory(const QString &path, const QStringList &entries)
+{
+    QPacket packet(connection()->currentDataStreamVersion());
+    packet << static_cast<qint8>(Directory) << path << entries;
+    sendMessage(packet.data());
+}
+
+void QQmlPreviewClient::sendFile(const QString &path, const QByteArray &contents)
+{
+    QPacket packet(connection()->currentDataStreamVersion());
+    packet << static_cast<qint8>(File) << path << contents;
+    sendMessage(packet.data());
+}
+
+void QQmlPreviewClient::sendError(const QString &path)
+{
+    QPacket packet(connection()->currentDataStreamVersion());
+    packet << static_cast<qint8>(Error) << path;
+    sendMessage(packet.data());
+}
+
+void QQmlPreviewClient::triggerLoad(const QUrl &url)
+{
+    QPacket packet(connection()->currentDataStreamVersion());
+    packet << static_cast<qint8>(Load) << url;
+    sendMessage(packet.data());
+}
+
+void QQmlPreviewClient::triggerRerun()
+{
+    QPacket packet(connection()->currentDataStreamVersion());
+    packet << static_cast<qint8>(Rerun);
+    sendMessage(packet.data());
+}
+
+void QQmlPreviewClient::triggerZoom(float factor)
+{
+    QPacket packet(connection()->currentDataStreamVersion());
+    packet << static_cast<qint8>(Zoom) << factor;
+    sendMessage(packet.data());
+}
+
+QT_END_NAMESPACE
diff --git a/src/qmldebug/qqmlpreviewclient_p.h b/src/qmldebug/qqmlpreviewclient_p.h
new file mode 100644
index 0000000000..49d147c866
--- /dev/null
+++ b/src/qmldebug/qqmlpreviewclient_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 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 QQMLPREVIEWCLIENT_P_H
+#define QQMLPREVIEWCLIENT_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 <private/qqmldebugclient_p.h>
+#include <private/qqmldebugconnection_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlPreviewClientPrivate;
+class QQmlPreviewClient : public QQmlDebugClient
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QQmlPreviewClient)
+public:
+    enum Command {
+        File,
+        Load,
+        Request,
+        Error,
+        Rerun,
+        Directory,
+        ClearCache,
+        Zoom
+    };
+
+    QQmlPreviewClient(QQmlDebugConnection *parent);
+    void messageReceived(const QByteArray &message) override;
+
+    void sendDirectory(const QString &path, const QStringList &entries);
+    void sendFile(const QString &path, const QByteArray &contents);
+    void sendError(const QString &path);
+
+    void triggerLoad(const QUrl &url);
+    void triggerRerun();
+    void triggerZoom(float factor);
+
+signals:
+    void request(const QString &path);
+    void error(const QString &message);
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLPREVIEWCLIENT_P_H
diff --git a/src/qmldebug/qqmlpreviewclient_p_p.h b/src/qmldebug/qqmlpreviewclient_p_p.h
new file mode 100644
index 0000000000..8fb2b4b18c
--- /dev/null
+++ b/src/qmldebug/qqmlpreviewclient_p_p.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 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 QQMLPREVIEWCLIENT_P_P_H
+#define QQMLPREVIEWCLIENT_P_P_H
+
+#include "qqmlpreviewclient_p.h"
+#include "qqmldebugclient_p_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.
+//
+
+QT_BEGIN_NAMESPACE
+
+class QQmlPreviewClientPrivate : public QQmlDebugClientPrivate
+{
+    Q_DECLARE_PUBLIC(QQmlPreviewClient)
+public:
+    QQmlPreviewClientPrivate(QQmlDebugConnection *connection)
+        : QQmlDebugClientPrivate(QLatin1String("QmlPreview"), connection)
+    {}
+};
+
+QT_END_NAMESPACE
+
+#endif // QQMLPREVIEWCLIENT_P_P_H
diff --git a/src/qmldebug/qqmlprofilerclient.cpp b/src/qmldebug/qqmlprofilerclient.cpp
index 661b43f164..73db2ad94d 100644
--- a/src/qmldebug/qqmlprofilerclient.cpp
+++ b/src/qmldebug/qqmlprofilerclient.cpp
@@ -42,6 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
+QQmlProfilerClientPrivate::~QQmlProfilerClientPrivate()
+{
+}
+
 int QQmlProfilerClientPrivate::resolveType(const QQmlProfilerTypedEvent &event)
 {
     int typeIndex = -1;
@@ -165,6 +169,7 @@ QQmlProfilerClient::QQmlProfilerClient(QQmlDebugConnection *connection,
 {
     Q_D(QQmlProfilerClient);
     setRequestedFeatures(features);
+    connect(this, &QQmlDebugClient::stateChanged, this, &QQmlProfilerClient::onStateChanged);
     connect(d->engineControl.data(), &QQmlEngineControlClient::engineAboutToBeAdded,
             this, &QQmlProfilerClient::sendRecordingStatus);
     connect(d->engineControl.data(), &QQmlEngineControlClient::engineAboutToBeRemoved,
@@ -314,7 +319,7 @@ bool QQmlProfilerClientPrivate::updateFeatures(ProfileFeature feature)
     return true;
 }
 
-void QQmlProfilerClient::stateChanged(State status)
+void QQmlProfilerClient::onStateChanged(State status)
 {
     if (status == Enabled) {
         sendRecordingStatus(-1);
diff --git a/src/qmldebug/qqmlprofilerclient_p.h b/src/qmldebug/qqmlprofilerclient_p.h
index 7b8e286f5b..89c117a8b5 100644
--- a/src/qmldebug/qqmlprofilerclient_p.h
+++ b/src/qmldebug/qqmlprofilerclient_p.h
@@ -76,7 +76,6 @@ public:
     void setRecording(bool);
     quint64 recordedFeatures() const;
     virtual void messageReceived(const QByteArray &) override;
-    virtual void stateChanged(State status) override;
 
     void clearEvents();
     void clearAll();
@@ -87,6 +86,7 @@ public:
 
 protected:
     QQmlProfilerClient(QQmlProfilerClientPrivate &dd);
+    void onStateChanged(State status);
 
 signals:
     void complete(qint64 maximumTime);
diff --git a/src/qmldebug/qqmlprofilerclient_p_p.h b/src/qmldebug/qqmlprofilerclient_p_p.h
index 994c08cafc..df73209858 100644
--- a/src/qmldebug/qqmlprofilerclient_p_p.h
+++ b/src/qmldebug/qqmlprofilerclient_p_p.h
@@ -79,7 +79,7 @@ public:
     {
     }
 
-    virtual ~QQmlProfilerClientPrivate() override {}
+    virtual ~QQmlProfilerClientPrivate() override;
 
     void sendRecordingStatus(int engineId);
     bool updateFeatures(ProfileFeature feature);
@@ -112,4 +112,3 @@ public:
 QT_END_NAMESPACE
 
 #endif // QQMLPROFILERCLIENT_P_P_H
-