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>

1 files changed, 2 insertions, 6 deletions

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);