diff options
Diffstat (limited to 'src/libs/utils/shellcommand.cpp')
| -rw-r--r-- | src/libs/utils/shellcommand.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index bdd0ba45f9..6742858aa0 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -347,9 +347,9 @@ SynchronousProcessResponse ShellCommand::runCommand(const CommandLine &command, // Success/Fail message in appropriate window? if (response.result == SynchronousProcessResponse::Finished) { if (d->m_flags & ShowSuccessMessage) - emit proxy->appendMessage(response.exitMessage(command.toUserOutput(), timeoutS)); + emit proxy->appendMessage(response.exitMessage(command.executable().toUserOutput(), timeoutS)); } else if (!(d->m_flags & SuppressFailMessage)) { - emit proxy->appendError(response.exitMessage(command.toUserOutput(), timeoutS)); + emit proxy->appendError(response.exitMessage(command.executable().toUserOutput(), timeoutS)); } } @@ -416,12 +416,10 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const CommandLine &cmd, // connect stderr to the output window if desired if (d->m_flags & MergeOutputChannels) { process.setProcessChannelMode(QProcess::MergedChannels); - } else if (d->m_progressiveOutput - || !(d->m_flags & SuppressStdErr)) { + } else if (d->m_progressiveOutput || !(d->m_flags & SuppressStdErr)) { process.setStdErrBufferedSignalsEnabled(true); connect(&process, &SynchronousProcess::stdErrBuffered, - this, [this, proxy](const QString &text) - { + this, [this, proxy](const QString &text) { if (d->m_progressParser) d->m_progressParser->parseProgress(text); if (!(d->m_flags & SuppressStdErr)) @@ -435,8 +433,7 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const CommandLine &cmd, if (d->m_progressParser || d->m_progressiveOutput || (d->m_flags & ShowStdOut)) { process.setStdOutBufferedSignalsEnabled(true); connect(&process, &SynchronousProcess::stdOutBuffered, - this, [this, proxy](const QString &text) - { + this, [this, proxy](const QString &text) { if (d->m_progressParser) d->m_progressParser->parseProgress(text); if (d->m_flags & ShowStdOut) |