From 53896ed2952f10234ebb2aeeaa2ddb1cbce25e6d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 16 Jun 2022 10:56:26 +0200
Subject: [PATCH] Utils: Dissolve QtcProcess::stopProcess

Change-Id: Ife07f34ffc69cd30984276464bd89738c2a71311
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/qtcprocess.cpp | 14 ++------------
 src/libs/utils/qtcprocess.h   |  1 -
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 6aeb7cac897..fdf013a5665 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -1285,17 +1285,6 @@ void QtcProcess::setRemoteProcessHooks(const DeviceProcessHooks &hooks)
     s_deviceHooks = hooks;
 }
 
-void QtcProcess::stopProcess()
-{
-    if (state() == QProcess::NotRunning)
-        return;
-    terminate();
-    if (waitForFinished(300))
-        return;
-    kill();
-    waitForFinished(300);
-}
-
 static bool askToKill(const QString &command)
 {
 #ifdef QT_GUI_LIB
@@ -1940,7 +1929,8 @@ void QtcProcessPrivate::slotTimeout()
             || askToKill(m_setup.m_commandLine.executable().toString());
         m_waitingForUser = false;
         if (terminate) {
-            q->stopProcess();
+            q->stop();
+            q->waitForFinished();
             m_result = ProcessResult::Hang;
         } else {
             m_hangTimerCount = 0;
diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h
index 15cc4693c3c..1c793451838 100644
--- a/src/libs/utils/qtcprocess.h
+++ b/src/libs/utils/qtcprocess.h
@@ -175,7 +175,6 @@ public:
     void setStdErrCallback(const std::function<void(const QString &)> &callback);
     void setStdErrLineCallback(const std::function<void(const QString &)> &callback);
 
-    void stopProcess();
     bool readDataFromProcess(int timeoutS, QByteArray *stdOut, QByteArray *stdErr,
                              bool showTimeOutMessageBox);