From a6917a54842c5c37afcf31c2831c261c51e372ce Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 17 Aug 2021 10:47:11 +0300 Subject: [PATCH] QtcProcess: Do not discard stdout and stderr buffers when callback is set 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 --- src/libs/utils/qtcprocess.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index ffb99ba0e15..fe0945d146e 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1077,8 +1077,6 @@ void QtcProcess::setStdOutCallback(const std::function & { 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 &callback) @@ -1092,7 +1090,6 @@ void QtcProcess::setStdErrCallback(const std::function & { d->m_stdErr.outputCallback = callback; d->m_stdErr.emitSingleLines = false; - d->m_stdErr.keepRawData = false; } void QtcProcess::setStdErrLineCallback(const std::function &callback)