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

ShellCommand: Pass OutputProxy to runFullySynchronous

Browse Source 
No need to create a fresh one.

Change-Id: I3c7b92319ab43030620428987dfa254be7ac03a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Tobias Hunger
2016-07-05 13:23:42 +02:00
parent 53c602633c
commit c2075f6a73
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -327,7 +327,7 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
proxy->appendCommand(dir, binary, arguments); proxy->appendCommand(dir, binary, arguments);
if (d->m_flags & FullySynchronously) { if (d->m_flags & FullySynchronously) {
response = runFullySynchronous(binary, arguments, timeoutS, dir, interpreter); response = runFullySynchronous(binary, arguments, proxy.data(), timeoutS, dir, interpreter);
} else { } else {
Utils::SynchronousProcess process; Utils::SynchronousProcess process;
process.setExitCodeInterpreter(interpreter); process.setExitCodeInterpreter(interpreter);
@@ -395,14 +395,13 @@ Utils::SynchronousProcessResponse ShellCommand::runCommand(const Utils::FileName
Utils::SynchronousProcessResponse ShellCommand::runFullySynchronous(const Utils::FileName &binary, Utils::SynchronousProcessResponse ShellCommand::runFullySynchronous(const Utils::FileName &binary,
const QStringList &arguments, const QStringList &arguments,
OutputProxy *proxy,
int timeoutS, int timeoutS,
const QString &workingDirectory, const QString &workingDirectory,
const ExitCodeInterpreter &interpreter) const ExitCodeInterpreter &interpreter)
{ {
Utils::SynchronousProcessResponse response; Utils::SynchronousProcessResponse response;
QScopedPointer<OutputProxy> proxy(d->m_proxyFactory());
// Set up process // Set up process
QSharedPointer<QProcess> process = Utils::SynchronousProcess::createProcess(processFlags()); QSharedPointer<QProcess> process = Utils::SynchronousProcess::createProcess(processFlags());
if (!d->m_defaultWorkingDirectory.isEmpty()) if (!d->m_defaultWorkingDirectory.isEmpty())

1
src/libs/utils/shellcommand.h
View File

@@ -163,6 +163,7 @@ protected:
private: private:
void run(QFutureInterface<void> &future); void run(QFutureInterface<void> &future);
SynchronousProcessResponse runFullySynchronous(const FileName &binary, const QStringList &arguments, SynchronousProcessResponse runFullySynchronous(const FileName &binary, const QStringList &arguments,
OutputProxy *proxy,
int timeoutS, const QString &workingDirectory, int timeoutS, const QString &workingDirectory,
const ExitCodeInterpreter &interpreter = defaultExitCodeInterpreter); const ExitCodeInterpreter &interpreter = defaultExitCodeInterpreter);