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

QtcProcess: Do not discard stdout and stderr buffers when callback is set

Browse Source 
All the uses of setStd{Out,Err}Callback in the codebase call proc.stdOut/
stdErr after the execution.

This triggered a soft assertion that was apparently not noticed so far.

It broke for example prompt for conflict resolution on Git pull/rebase.

Change-Id: Ib4b8301f1f50b2b66f02fc4dc6c14d93f895ea33
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2021-08-17 10:47:11 +03:00
committed by Orgad Shaneh
parent e47ca44fa2
commit a6917a5484
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1077,8 +1077,6 @@ void QtcProcess::setStdOutCallback(const std::function<void (const QString &)> &
{
d->m_stdOut.outputCallback = callback;
d->m_stdOut.emitSingleLines = false;
d->m_stdOut.emitSingleLines = false;
d->m_stdOut.keepRawData = false;
}
void QtcProcess::setStdOutLineCallback(const std::function<void (const QString &)> &callback)
@@ -1092,7 +1090,6 @@ void QtcProcess::setStdErrCallback(const std::function<void (const QString &)> &
{
d->m_stdErr.outputCallback = callback;
d->m_stdErr.emitSingleLines = false;
d->m_stdErr.keepRawData = false;
}
void QtcProcess::setStdErrLineCallback(const std::function<void (const QString &)> &callback)