Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0

2 files changed, 175 insertions, 67 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/commands/captureddatacommand.h b/share/qtcreator/qml/qmlpuppet/commands/captureddatacommand.h
new file mode 100644
index 0000000000..c7950e278b
--- /dev/null
+++ b/share/qtcreator/qml/qmlpuppet/commands/captureddatacommand.h
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2020 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** 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 General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** 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-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QMetaType>
+
+#include "imagecontainer.h"
+
+namespace QmlDesigner {
+
+class CapturedDataCommand
+{
+public:
+    struct NodeData
+    {
+        friend QDataStream &operator<<(QDataStream &out, const NodeData &data)
+        {
+            out << data.nodeId;
+            out << data.contentRect;
+            out << data.sceneTransform;
+            out << data.text;
+
+            return out;
+        }
+
+        friend QDataStream &operator>>(QDataStream &in, NodeData &data)
+        {
+            in >> data.nodeId;
+            in >> data.contentRect;
+            in >> data.sceneTransform;
+            in >> data.text;
+
+            return in;
+        }
+
+        qint32 nodeId = -1;
+        QRectF contentRect;
+        QTransform sceneTransform;
+        QString text;
+    };
+
+    struct StateData
+    {
+        friend QDataStream &operator<<(QDataStream &out, const StateData &data)
+        {
+            out << data.image;
+            out << data.nodeData;
+
+            return out;
+        }
+
+        friend QDataStream &operator>>(QDataStream &in, StateData &data)
+        {
+            in >> data.image;
+            in >> data.nodeData;
+
+            return in;
+        }
+
+        ImageContainer image;
+        QVector<NodeData> nodeData;
+    };
+
+    friend QDataStream &operator<<(QDataStream &out, const CapturedDataCommand &command)
+    {
+        out << command.stateData;
+
+        return out;
+    }
+
+    friend QDataStream &operator>>(QDataStream &in, CapturedDataCommand &command)
+    {
+        in >> command.stateData;
+
+        return in;
+    }
+
+public:
+    QVector<StateData> stateData;
+};
+
+} // namespace QmlDesigner
+
+Q_DECLARE_METATYPE(QmlDesigner::CapturedDataCommand)
diff --git a/share/qtcreator/qml/qmlpuppet/commands/commands.pri b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
index 03a44ae750..f343cbbd47 100644
--- a/share/qtcreator/qml/qmlpuppet/commands/commands.pri
+++ b/share/qtcreator/qml/qmlpuppet/commands/commands.pri
@@ -1,69 +1,70 @@
-INCLUDEPATH += $$PWD/
+INCLUDEPATH += $$PWD
 
-HEADERS += $$PWD/synchronizecommand.h
-HEADERS += $$PWD/changepreviewimagesizecommand.h
-HEADERS += $$PWD/changelanguagecommand.h
-HEADERS += $$PWD//debugoutputcommand.h
-HEADERS += $$PWD/endpuppetcommand.h
-HEADERS += $$PWD/tokencommand.h
-HEADERS += $$PWD/componentcompletedcommand.h
-HEADERS += $$PWD/completecomponentcommand.h
-HEADERS += $$PWD/statepreviewimagechangedcommand.h
-HEADERS += $$PWD/childrenchangedcommand.h
-HEADERS += $$PWD/changebindingscommand.h
-HEADERS += $$PWD/changefileurlcommand.h
-HEADERS += $$PWD/changeidscommand.h
-HEADERS += $$PWD/changenodesourcecommand.h
-HEADERS += $$PWD/changestatecommand.h
-HEADERS += $$PWD/changevaluescommand.h
-HEADERS += $$PWD/createscenecommand.h
-HEADERS += $$PWD/clearscenecommand.h
-HEADERS += $$PWD/createinstancescommand.h
-HEADERS += $$PWD/informationchangedcommand.h
-HEADERS += $$PWD/pixmapchangedcommand.h
-HEADERS += $$PWD/removeinstancescommand.h
-HEADERS += $$PWD/removepropertiescommand.h
-HEADERS += $$PWD/reparentinstancescommand.h
-HEADERS += $$PWD/valueschangedcommand.h
-HEADERS += $$PWD/changeauxiliarycommand.h
-HEADERS += $$PWD/removesharedmemorycommand.h
-HEADERS += $$PWD/puppetalivecommand.h
-HEADERS += $$PWD/changeselectioncommand.h
-HEADERS += $$PWD/update3dviewstatecommand.h
-HEADERS += $$PWD/puppettocreatorcommand.h
-HEADERS += $$PWD/inputeventcommand.h
-HEADERS += $$PWD/view3dactioncommand.h
+HEADERS += $$PWD/synchronizecommand.h \ \
+    $$PWD/captureddatacommand.h \
+    $$PWD/changepreviewimagesizecommand.h \
+    $$PWD/changelanguagecommand.h \
+    $$PWD//debugoutputcommand.h \
+    $$PWD/endpuppetcommand.h \
+    $$PWD/tokencommand.h \
+    $$PWD/componentcompletedcommand.h \
+    $$PWD/completecomponentcommand.h \
+    $$PWD/statepreviewimagechangedcommand.h \
+    $$PWD/childrenchangedcommand.h \
+    $$PWD/changebindingscommand.h \
+    $$PWD/changefileurlcommand.h \
+    $$PWD/changeidscommand.h \
+    $$PWD/changenodesourcecommand.h \
+    $$PWD/changestatecommand.h \
+    $$PWD/changevaluescommand.h \
+    $$PWD/createscenecommand.h \
+    $$PWD/clearscenecommand.h \
+    $$PWD/createinstancescommand.h \
+    $$PWD/informationchangedcommand.h \
+    $$PWD/pixmapchangedcommand.h \
+    $$PWD/removeinstancescommand.h \
+    $$PWD/removepropertiescommand.h \
+    $$PWD/reparentinstancescommand.h \
+    $$PWD/valueschangedcommand.h \
+    $$PWD/changeauxiliarycommand.h \
+    $$PWD/removesharedmemorycommand.h \
+    $$PWD/puppetalivecommand.h \
+    $$PWD/changeselectioncommand.h \
+    $$PWD/update3dviewstatecommand.h \
+    $$PWD/puppettocreatorcommand.h \
+    $$PWD/inputeventcommand.h \
+    $$PWD/view3dactioncommand.h
 
-SOURCES += $$PWD/synchronizecommand.cpp
-SOURCES += $$PWD/changepreviewimagesizecommand.cpp
-SOURCES += $$PWD/changelanguagecommand.cpp
-SOURCES += $$PWD/debugoutputcommand.cpp
-SOURCES += $$PWD/endpuppetcommand.cpp
-SOURCES += $$PWD/tokencommand.cpp
-SOURCES += $$PWD/componentcompletedcommand.cpp
-SOURCES += $$PWD/completecomponentcommand.cpp
-SOURCES += $$PWD/statepreviewimagechangedcommand.cpp
-SOURCES += $$PWD/childrenchangedcommand.cpp
-SOURCES += $$PWD/changebindingscommand.cpp
-SOURCES += $$PWD/changefileurlcommand.cpp
-SOURCES += $$PWD/changeidscommand.cpp
-SOURCES += $$PWD/changenodesourcecommand.cpp
-SOURCES += $$PWD/changestatecommand.cpp
-SOURCES += $$PWD/changevaluescommand.cpp
-SOURCES += $$PWD/informationchangedcommand.cpp
-SOURCES += $$PWD/removeinstancescommand.cpp
-SOURCES += $$PWD/removepropertiescommand.cpp
-SOURCES += $$PWD/reparentinstancescommand.cpp
-SOURCES += $$PWD/valueschangedcommand.cpp
-SOURCES += $$PWD/clearscenecommand.cpp
-SOURCES += $$PWD/createinstancescommand.cpp
-SOURCES += $$PWD/createscenecommand.cpp
-SOURCES += $$PWD/pixmapchangedcommand.cpp
-SOURCES += $$PWD/changeauxiliarycommand.cpp
-SOURCES += $$PWD/removesharedmemorycommand.cpp
-SOURCES += $$PWD/puppetalivecommand.cpp
-SOURCES += $$PWD/changeselectioncommand.cpp
-SOURCES += $$PWD/update3dviewstatecommand.cpp
-SOURCES += $$PWD/puppettocreatorcommand.cpp
-SOURCES += $$PWD/inputeventcommand.cpp
-SOURCES += $$PWD/view3dactioncommand.cpp
+SOURCES += $$PWD/synchronizecommand.cpp \
+    $$PWD/changepreviewimagesizecommand.cpp \
+    $$PWD/changelanguagecommand.cpp \
+    $$PWD/debugoutputcommand.cpp \
+    $$PWD/endpuppetcommand.cpp \
+    $$PWD/tokencommand.cpp \
+    $$PWD/componentcompletedcommand.cpp \
+    $$PWD/completecomponentcommand.cpp \
+    $$PWD/statepreviewimagechangedcommand.cpp \
+    $$PWD/childrenchangedcommand.cpp \
+    $$PWD/changebindingscommand.cpp \
+    $$PWD/changefileurlcommand.cpp \
+    $$PWD/changeidscommand.cpp \
+    $$PWD/changenodesourcecommand.cpp \
+    $$PWD/changestatecommand.cpp \
+    $$PWD/changevaluescommand.cpp \
+    $$PWD/informationchangedcommand.cpp \
+    $$PWD/removeinstancescommand.cpp \
+    $$PWD/removepropertiescommand.cpp \
+    $$PWD/reparentinstancescommand.cpp \
+    $$PWD/valueschangedcommand.cpp \
+    $$PWD/clearscenecommand.cpp \
+    $$PWD/createinstancescommand.cpp \
+    $$PWD/createscenecommand.cpp \
+    $$PWD/pixmapchangedcommand.cpp \
+    $$PWD/changeauxiliarycommand.cpp \
+    $$PWD/removesharedmemorycommand.cpp \
+    $$PWD/puppetalivecommand.cpp \
+    $$PWD/changeselectioncommand.cpp \
+    $$PWD/update3dviewstatecommand.cpp \
+    $$PWD/puppettocreatorcommand.cpp \
+    $$PWD/inputeventcommand.cpp \
+    $$PWD/view3dactioncommand.cpp