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

Utils: Fix interrupting local processes on *nix

Browse Source 
Change-Id: I6e722379ad62c98d1e8e6d445c1eeea171ff141b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2022-11-15 09:25:16 +01:00
parent ef658663aa
commit 779dc52a97
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/processutils.cpp
View File

@@ -10,7 +10,9 @@
#include <qt_windows.h> #include <qt_windows.h>
#else #else
#include <errno.h> #include <errno.h>
#include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
@@ -127,7 +129,7 @@ void ProcessHelper::interruptPid(qint64 pid)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
EnumWindows(sendInterruptMessageToAllWindowsOfProcess_enumWnd, pid); EnumWindows(sendInterruptMessageToAllWindowsOfProcess_enumWnd, pid);
#else #else
Q_UNUSED(pid) ::kill(pid, SIGINT);
#endif #endif
} }

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

@@ -459,8 +459,7 @@ private:
m_handle->kill(); m_handle->kill();
break; break;
case ControlSignal::Interrupt: case ControlSignal::Interrupt:
if (m_setup.m_useCtrlCStub) // bypass launcher and interrupt directly ProcessHelper::interruptPid(m_handle->processId());
ProcessHelper::interruptPid(m_handle->processId());
break; break;
case ControlSignal::KickOff: case ControlSignal::KickOff:
QTC_CHECK(false); QTC_CHECK(false);