From 5b0c2bcbf894034715616a6ca33bf5a21b9788bb Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 19 Sep 2022 08:02:23 +0200 Subject: [PATCH] QtcProcess: Fix stdErr() assert The keepRawData field may be false only after calling setStdErrLineCallback(). In all current usages (7 places) we don't call stdErr() nor cleanedStdErr(). VcsCommand was using setStdErrCallback() so that did not change the keepRawData to false. It looks like currently it should be safe to fix this assert. Amends 4000819262e7cce82b95cb42378aa178ca62a0d6 Change-Id: I9f8627166d194579c5a0fe13d241ff37aecac47c Reviewed-by: hjk --- src/libs/utils/qtcprocess.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 4c5dee4d493..a60419b5410 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -1688,11 +1688,7 @@ QString QtcProcess::stdOut() const QString QtcProcess::stdErr() const { - // FIXME: The tighter check below is actually good theoretically, but currently - // VcsCommand::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()); + QTC_CHECK(d->m_stdErr.keepRawData); return d->m_codec->toUnicode(d->m_stdErr.rawData); }