From edf6178896348d34fae3fe465cf577c5b3abb180 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 6 May 2021 17:51:09 +0200
Subject: [PATCH] Utils: Simplify QtcProcess::run{,Blocking} for remote
 processes

No need to wrap another QtcProcess.

Change-Id: I27e8bf454605f70e99d9c37de09e0332337eb739
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/libs/utils/qtcprocess.cpp | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 3ea6d6b5275..bc15199c1d9 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -752,21 +752,18 @@ SynchronousProcessResponse QtcProcess::run(const CommandLine &cmd, const QByteAr
 {
     // FIXME: Implement properly
     if (cmd.executable().needsDevice()) {
-        QtcProcess proc;
-        proc.setEnvironment(Environment(environment()));
-        proc.setWorkingDirectory(workingDirectory());
-        proc.setCommand(cmd);
+        setCommand(cmd);
 
         // writeData ?
-        proc.start();
+        start();
 
-        proc.waitForFinished();
+        waitForFinished();
 
         SynchronousProcessResponse res;
         res.result = SynchronousProcessResponse::Finished;
-        res.exitCode = proc.exitCode();
-        res.rawStdOut = proc.readAllStandardOutput();
-        res.rawStdErr = proc.readAllStandardError();
+        res.exitCode = exitCode();
+        res.rawStdOut = readAllStandardOutput();
+        res.rawStdErr = readAllStandardError();
         return res;
     };
 
@@ -821,21 +818,18 @@ SynchronousProcessResponse QtcProcess::runBlocking(const CommandLine &cmd)
 {
     // FIXME: Implement properly
     if (cmd.executable().needsDevice()) {
-        QtcProcess proc;
-        proc.setEnvironment(Environment(environment()));
-        proc.setWorkingDirectory(workingDirectory());
-        proc.setCommand(cmd);
+        setCommand(cmd);
 
         // writeData ?
-        proc.start();
+        start();
 
-        proc.waitForFinished();
+        waitForFinished();
 
         SynchronousProcessResponse res;
         res.result = SynchronousProcessResponse::Finished;
-        res.exitCode = proc.exitCode();
-        res.rawStdOut = proc.readAllStandardOutput();
-        res.rawStdErr = proc.readAllStandardError();
+        res.exitCode = exitCode();
+        res.rawStdOut = readAllStandardOutput();
+        res.rawStdErr = readAllStandardError();
         return res;
     };