From ad5b34ab3e61ca0bbeecb3b716fb45ffcf90060a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 6 May 2021 15:38:12 +0200
Subject: [PATCH] Utils: Remove QtcProcess::{is,set}Synchronous

This reverts a bit of fe8fbf1a4a which was over-shooting API-wise.

Change-Id: Iac4c2b9fa550f7ec0b0aa8deea8c3fc6b6ddcfba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/libs/utils/qtcprocess.cpp       | 14 --------------
 src/libs/utils/qtcprocess.h         |  3 ---
 src/plugins/docker/dockerdevice.cpp |  2 +-
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index a711d57bcab..1673424ff5b 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -104,7 +104,6 @@ public:
     bool m_lowPriority = false;
     bool m_disableUnixTerminal = false;
 
-    bool m_synchronous = false;
     QProcess::OpenMode m_openMode = QProcess::ReadWrite;
 
     // SynchronousProcess left overs:
@@ -263,9 +262,6 @@ void QtcProcess::start()
         }
         QProcess::start(command, arguments.toUnixArgs(), d->m_openMode);
     }
-
-    if (d->m_synchronous)
-        QProcess::waitForFinished();
 }
 
 #ifdef Q_OS_WIN
@@ -349,16 +345,6 @@ void QtcProcessPrivate::setupChildProcess_impl()
 #endif
 }
 
-bool QtcProcess::isSynchronous() const
-{
-    return d->m_synchronous;
-}
-
-void QtcProcess::setSynchronous(bool on)
-{
-    d->m_synchronous = on;
-}
-
 void QtcProcess::setOpenMode(OpenMode mode)
 {
     d->m_openMode = mode;
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index cc5aba33270..f602831641b 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -121,9 +121,6 @@ public:
 
     static void setRemoteStartProcessHook(const std::function<void (QtcProcess &)> &hook);
 
-    bool isSynchronous() const;
-    void setSynchronous(bool on);
-
     void setOpenMode(OpenMode mode);
 
     bool stopProcess();
diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp
index 06a1a617c52..9b78de1280f 100644
--- a/src/plugins/docker/dockerdevice.cpp
+++ b/src/plugins/docker/dockerdevice.cpp
@@ -663,8 +663,8 @@ int DockerDevicePrivate::runSynchronously(const CommandLine &cmd) const
     QtcProcess proc;
     proc.setCommand(dcmd);
     proc.setWorkingDirectory("/tmp");
-    proc.setSynchronous(true);
     proc.start();
+    proc.waitForFinished();
 
     LOG("Run sync:" << dcmd.toUserOutput() << " result: " << proc.exitCode());
     return proc.exitCode();