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

Utils: use cleaned stdout all over the place again

Browse Source 
Amends 5ee880ce5e

Change-Id: Ie0202db7d8455372c3697087d9571db6706b45a1
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2022-06-17 14:17:14 +02:00
parent dcd3d9e717
commit 153ff77a6b
48 changed files with 145 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/shellcommand.cpp
View File

@@ -271,8 +271,8 @@ void ShellCommand::run(QFutureInterface<void> &future)
proc.setExitCodeInterpreter(job.exitCodeInterpreter);
proc.setTimeoutS(job.timeoutS);
runCommand(proc, job.command, job.workingDirectory);
stdOut += proc.stdOut();
stdErr += proc.stdErr();
stdOut += proc.cleanedStdOut();
stdErr += proc.cleanedStdErr();
d->m_lastExecExitCode = proc.exitCode();
d->m_lastExecSuccess = proc.result() == ProcessResult::FinishedWithSuccess;
if (!d->m_lastExecSuccess)
@@ -352,11 +352,11 @@ void ShellCommand::runFullySynchronous(QtcProcess &process, const FilePath &work
process.runBlocking();
if (!d->m_aborted) {
const QString stdErr = process.stdErr();
const QString stdErr = process.cleanedStdErr();
if (!stdErr.isEmpty() && !(d->m_flags & SuppressStdErr))
emit append(stdErr);
const QString stdOut = process.stdOut();
const QString stdOut = process.cleanedStdOut();
if (!stdOut.isEmpty() && d->m_flags & ShowStdOut) {
if (d->m_flags & SilentOutput)
emit appendSilently(stdOut);