Prepare merge of qds-1.59 to 4.13qds-1.59

It is not compiling but we are closing this branch anyway.

Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

12 files changed, 16 insertions, 9 deletions

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
index ce9bb2376e..fdc862991e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
@@ -55,4 +55,5 @@ SOURCES += $$PWD/qt5nodeinstanceserver.cpp \
     $$PWD/positionernodeinstance.cpp \
     $$PWD/layoutnodeinstance.cpp \
     $$PWD/qt3dpresentationnodeinstance.cpp \
-    $$PWD/quick3dnodeinstance.cpp
+    $$PWD/quick3dnodeinstance.cpp \
+    $$PWD/quick3dtexturenodeinstance.cpp
diff --git a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
index 0d4540b37f..b7a2cc282e 100644
--- a/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/baseconnectionmanager.cpp
@@ -29,6 +29,7 @@
 #include "nodeinstanceview.h"
 
 #include <QLocalSocket>
+#include <QTimer>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
index b6e81f1ffe..4be52a327c 100644
--- a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp
@@ -27,6 +27,10 @@
 
 #include <coreplugin/messagebox.h>
 
+#include <QCoreApplication>
+#include <QDebug>
+#include <QTimer>
+
 namespace QmlDesigner {
 
 void CapturingConnectionManager::setUp(NodeInstanceServerProxy *nodeInstanceServerProxy,
diff --git a/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp
index edf7f20b9c..fa8528579d 100644
--- a/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/connectionmanager.cpp
@@ -37,6 +37,7 @@
 
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QTimer>
 #include <QUuid>
 
 namespace QmlDesigner {
diff --git a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp
index 2aa7df6be6..b4fdb70794 100644
--- a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.cpp
@@ -27,6 +27,7 @@
 
 #include <QLocalSocket>
 #include <QProcess>
+#include <QTimer>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h
index f3d8e6293e..92d7449bc0 100644
--- a/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h
+++ b/src/plugins/qmldesigner/designercore/instances/connectionmanagerinterface.h
@@ -26,6 +26,7 @@
 #include "qprocessuniqueptr.h"
 #include <qmldesignercorelib_global.h>
 
+#include <QTimer>
 
 QT_BEGIN_NAMESPACE
 class QLocalSocket;
diff --git a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
index 4b6c73f19e..6da44603df 100644
--- a/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/interactiveconnectionmanager.cpp
@@ -32,6 +32,7 @@
 #include <coreplugin/messagebox.h>
 
 #include <QLocalSocket>
+#include <QTimer>
 
 namespace QmlDesigner {
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs
index 971bcffb47..4c0b1d223d 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.qbs
+++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs
@@ -134,6 +134,7 @@ Project {
                 "commands/changestatecommand.h",
                 "commands/changevaluescommand.cpp",
                 "commands/changevaluescommand.h",
+                "commands/captureddatacommand.h",
                 "commands/childrenchangedcommand.cpp",
                 "commands/childrenchangedcommand.h",
                 "commands/clearscenecommand.cpp",
diff --git a/src/plugins/qmlpreview/CMakeLists.txt b/src/plugins/qmlpreview/CMakeLists.txt
index ab5024660c..00bda33ab0 100644
--- a/src/plugins/qmlpreview/CMakeLists.txt
+++ b/src/plugins/qmlpreview/CMakeLists.txt
@@ -10,6 +10,7 @@ add_qtc_plugin(QmlPreview
     qmldebugtranslationclient.cpp qmldebugtranslationclient.h
     qmlpreview_global.h
     projectfileselectionswidget.cpp projectfileselectionswidget.h
+    qmldebugtranslationwidget.cpp qmldebugtranslationwidget.h
 )
 
 extend_qtc_plugin(QmlPreview
diff --git a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
index 2590e96363..3de3eff2c2 100644
--- a/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
+++ b/src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
@@ -288,7 +288,8 @@ void QmlDebugTranslationWidget::runTest()
     connect(runControl, &ProjectExplorer::RunControl::started, [this, runControl, previewPlugin]() {
         //Q_ASSERT(m_currentRunControl == nullptr); //TODO: who deletes the runcontrol
         m_currentRunControl = runControl;
-        m_runOutputWindow->setFormatter(runControl->outputFormatter());
+        m_runOutputWindow->setLineParsers(
+            ProjectExplorer::OutputFormatterFactory::createFormatters(runControl->target()));
         int timerCounter = 1;
         const auto testLanguageList = m_testLanguages;
 
@@ -414,11 +415,6 @@ void QmlDebugTranslationWidget::appendMessage(const QString &message, Utils::Out
         fileLine = qmlLineColumnMatch.captured(2).toInt();
     }
 
-    if (!m_runOutputWindow->formatter()) {
-        auto defaultFormatter = new Utils::OutputFormatter();
-        defaultFormatter->setParent(this);
-        m_runOutputWindow->setFormatter(defaultFormatter);
-    }
     m_runOutputWindow->appendMessage(message, format);
 
 
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt
index d5a6b39e06..34c50da05d 100644
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -52,7 +52,7 @@ extend_qtc_executable(qml2puppet
     inputeventcommand.cpp inputeventcommand.h
     view3dactioncommand.cpp view3dactioncommand.h
     valueschangedcommand.cpp
-    captureddatacommand.cpp captureddatacommand.h
+    captureddatacommand.h
 )
 
 extend_qtc_executable(qml2puppet
diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs
index b30ce11dc8..61c5962542 100644
--- a/src/tools/qml2puppet/qml2puppet.qbs
+++ b/src/tools/qml2puppet/qml2puppet.qbs
@@ -107,7 +107,6 @@ QtcTool {
             "commands/inputeventcommand.h",
             "commands/view3dactioncommand.cpp",
             "commands/view3dactioncommand.h",
-            "commands/captureddatacommand.cpp",
             "commands/captureddatacommand.h",
             "container/addimportcontainer.cpp",
             "container/addimportcontainer.h",