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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Change-Id: I86049934ae744e22e4a728ab79c0cf6880ff3c7d
This commit is contained in:
Eike Ziller
2021-08-12 11:05:11 +02:00
parent a78665ede7 9521d22758
commit ba5f2e27f0
69 changed files with 424 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/qtcprocess.cpp
View File

@@ -1052,7 +1052,11 @@ QString QtcProcess::stdOut() const
QString QtcProcess::stdErr() const
{
QTC_CHECK(d->m_stdErr.keepRawData);
// FIXME: The tighter check below is actually good theoretically, but currently
// ShellCommand::runFullySynchronous triggers it and disentangling there
// is not trivial. So weaken it a bit for now.
//QTC_CHECK(d->m_stdErr.keepRawData);
QTC_CHECK(d->m_stdErr.keepRawData || d->m_stdErr.rawData.isEmpty());
return normalizeNewlines(d->m_codec->toUnicode(d->m_stdErr.rawData));
}