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

Utils: Simplify QtcProcess::run{,Blocking} for remote processes

Browse Source 
No need to wrap another QtcProcess.

Change-Id: I27e8bf454605f70e99d9c37de09e0332337eb739
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-05-06 17:51:09 +02:00
parent 0ab08e8574
commit edf6178896
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/libs/utils/qtcprocess.cpp
View File

@@ -752,21 +752,18 @@ SynchronousProcessResponse QtcProcess::run(const CommandLine &cmd, const QByteAr
{ {
// FIXME: Implement properly // FIXME: Implement properly
if (cmd.executable().needsDevice()) { if (cmd.executable().needsDevice()) {
QtcProcess proc; setCommand(cmd);
proc.setEnvironment(Environment(environment()));
proc.setWorkingDirectory(workingDirectory());
proc.setCommand(cmd);
// writeData ? // writeData ?
proc.start(); start();
proc.waitForFinished(); waitForFinished();
SynchronousProcessResponse res; SynchronousProcessResponse res;
res.result = SynchronousProcessResponse::Finished; res.result = SynchronousProcessResponse::Finished;
res.exitCode = proc.exitCode(); res.exitCode = exitCode();
res.rawStdOut = proc.readAllStandardOutput(); res.rawStdOut = readAllStandardOutput();
res.rawStdErr = proc.readAllStandardError(); res.rawStdErr = readAllStandardError();
return res; return res;
}; };
@@ -821,21 +818,18 @@ SynchronousProcessResponse QtcProcess::runBlocking(const CommandLine &cmd)
{ {
// FIXME: Implement properly // FIXME: Implement properly
if (cmd.executable().needsDevice()) { if (cmd.executable().needsDevice()) {
QtcProcess proc; setCommand(cmd);
proc.setEnvironment(Environment(environment()));
proc.setWorkingDirectory(workingDirectory());
proc.setCommand(cmd);
// writeData ? // writeData ?
proc.start(); start();
proc.waitForFinished(); waitForFinished();
SynchronousProcessResponse res; SynchronousProcessResponse res;
res.result = SynchronousProcessResponse::Finished; res.result = SynchronousProcessResponse::Finished;
res.exitCode = proc.exitCode(); res.exitCode = exitCode();
res.rawStdOut = proc.readAllStandardOutput(); res.rawStdOut = readAllStandardOutput();
res.rawStdErr = proc.readAllStandardError(); res.rawStdErr = readAllStandardError();
return res; return res;
}; };