feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Prepare merge of qds-1.59 to 4.13

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

Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2020-08-12 13:18:24 +02:00
committed by Tim Jenssen
parent 208ebd6043
commit dc870f538d
12 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmlpreview/qmldebugtranslationwidget.cpp
View File

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