From 4000819262e7cce82b95cb42378aa178ca62a0d6 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 11 Aug 2021 16:41:49 +0200 Subject: [PATCH] Utils: Weaken QTC_CHECK in QtcProcess::stdErr() The previous tighter check is actually good theoretically, but currently ShellCommand::runFullySynchronous triggers it and disentangling there is not trivial. So weaken it a bit for now to not annoy users. Change-Id: Ifc6b5713b398db0af0f604834c37ff361c2a1ed3 Reviewed-by: Christian Kandeler --- src/libs/utils/qtcprocess.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index f77d186b30b..ffb99ba0e15 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -876,7 +876,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)); }