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

Utils: Fix indentation in ShellCommand

Browse Source 
Change-Id: Ia93d5f50c4ea1e130ddfafe763fe0bd5cc95fad1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-05 12:54:52 +02:00
committed by Orgad Shaneh
parent 36d5bc1e98
commit 9a723a0c98
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,30 +357,29 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
process.setStdErrBufferedSignalsEnabled(true); process.setStdErrBufferedSignalsEnabled(true);
connect(&process, &Utils::SynchronousProcess::stdErrBuffered, connect(&process, &Utils::SynchronousProcess::stdErrBuffered,
this, [this, proxy](const QString &text) this, [this, proxy](const QString &text)
{ {
if (!(d->m_flags & SuppressStdErr)) if (!(d->m_flags & SuppressStdErr))
proxy->appendError(text); proxy->appendError(text);
if (d->m_progressiveOutput) if (d->m_progressiveOutput)
emit stdErrText(text); emit stdErrText(text);
}); });
} }
// connect stdout to the output window if desired // connect stdout to the output window if desired
if (d->m_progressParser || d->m_progressiveOutput if (d->m_progressParser || d->m_progressiveOutput || (d->m_flags & ShowStdOut)) {
|| (d->m_flags & ShowStdOut)) {
process.setStdOutBufferedSignalsEnabled(true); process.setStdOutBufferedSignalsEnabled(true);
connect(&process, &Utils::SynchronousProcess::stdOutBuffered, connect(&process, &Utils::SynchronousProcess::stdOutBuffered,
this, [this, proxy](const QString &text) this, [this, proxy](const QString &text)
{ {
if (d->m_progressParser) if (d->m_progressParser)
d->m_progressParser->parseProgress(text); d->m_progressParser->parseProgress(text);
if (d->m_flags & ShowStdOut) if (d->m_flags & ShowStdOut)
proxy->append(text); proxy->append(text);
if (d->m_progressiveOutput) { if (d->m_progressiveOutput) {
emit stdOutText(text); emit stdOutText(text);
d->m_hadOutput = true; d->m_hadOutput = true;
} }
}); });
} }
process.setTimeOutMessageBoxEnabled(true); process.setTimeOutMessageBoxEnabled(true);