diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-31 17:56:10 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-06 08:46:36 +0000 |
| commit | 76e85ab77aba9fa3d2ce0e326a6add49624819c1 (patch) | |
| tree | d7f860e0913bb569a93d64e078d77129f176d1b2 /src/plugins/remotelinux/remotelinuxsignaloperation.cpp | |
| parent | 9ce19c5dacfece96bd2377e06dfd72e9ce27a4e7 (diff) | |
RemoteLinux: Try SIGTERM first when terminating processes
This was done for the "kill by process name" operation, but not for the
"kill by PID" one.
Change-Id: Ia8eb57d1fa030624470489dbd0e7b03093fd822b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxsignaloperation.cpp')
| -rw-r--r-- | src/plugins/remotelinux/remotelinuxsignaloperation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp index 446a83448e..671ca1ce5f 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp @@ -96,7 +96,8 @@ QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QStr void RemoteLinuxSignalOperation::killProcess(qint64 pid) { - run(signalProcessByPidCommandLine(pid, 9)); + run(QString::fromLatin1("%1; %2").arg(signalProcessByPidCommandLine(pid, 15), + signalProcessByPidCommandLine(pid, 9))); } void RemoteLinuxSignalOperation::killProcess(const QString &filePath) |