From 8da67b75c500fcfda5e9ef781d5e09472b9cf74a Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Thu, 4 Jul 2024 19:55:23 +0200
Subject: [PATCH] RemoteLinux: Use reaper timeout setting also in signal
 operation

Fixes: QTCREATORBUG-31200
Change-Id: I5093f761c58551702cbc82ad16e4034ef30efb38
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/remotelinux/remotelinuxsignaloperation.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
index 95e68a64854..9eaa1471d22 100644
--- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
+++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp
@@ -5,6 +5,7 @@
 
 #include "remotelinuxtr.h"
 
+#include <projectexplorer/projectexplorersettings.h>
 #include <utils/commandline.h>
 #include <utils/fileutils.h>
 #include <utils/qtcprocess.h>
@@ -50,8 +51,10 @@ static QString signalProcessGroupByNameCommandLine(const QString &filePath, int
 
 QString RemoteLinuxSignalOperation::killProcessByNameCommandLine(const QString &filePath) const
 {
-    return QString::fromLatin1("%1; %2").arg(signalProcessGroupByNameCommandLine(filePath, 15),
-                                             signalProcessGroupByNameCommandLine(filePath, 9));
+    return QString::fromLatin1("%1; sleep %2; %3")
+        .arg(signalProcessGroupByNameCommandLine(filePath, 15))
+        .arg(projectExplorerSettings().reaperTimeoutInSeconds)
+        .arg(signalProcessGroupByNameCommandLine(filePath, 9));
 }
 
 QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QString &filePath) const