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

Merge remote-tracking branch 'origin/4.7' into 4.8

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ia1d6035a335fd56069ec8d6d106d58124ee8798d
This commit is contained in:
Eike Ziller
2018-09-21 09:26:38 +02:00
parent b49175c86a 3c8f8f1ffc
commit d3d47dd521
3 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -1610,12 +1610,12 @@ void SimpleTargetRunner::start()
connect(&m_launcher, &ApplicationLauncher::remoteStderr,
this, [this](const QString &output) {
appendMessage(output, Utils::StdErrFormatSameLine);
appendMessage(output, Utils::StdErrFormatSameLine, false);
});
connect(&m_launcher, &ApplicationLauncher::remoteStdout,
this, [this](const QString &output) {
appendMessage(output, Utils::StdOutFormatSameLine);
appendMessage(output, Utils::StdOutFormatSameLine, false);
});
connect(&m_launcher, &ApplicationLauncher::finished,