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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0
This commit is contained in:
Eike Ziller
2017-09-19 12:00:16 +02:00
parent fe1cbd0f87 b58dadfecc
commit 3d9cf954e2
40 changed files with 9999 additions and 6050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/testrunner.cpp
View File

@@ -309,7 +309,7 @@ static void processOutput(TestOutputReader *outputreader, const QString &msg,
break;
}
for (const QString &line : msg.mid(start).split('\n'))
outputreader->processOutput(line.toUtf8() + '\n');
outputreader->processOutput(line.toUtf8());
break;
}
case Utils::OutputFormat::StdErrFormatSameLine: