From 24a98feada15a9d55bad61bb15a6998c266d54b5 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 18 Nov 2009 17:01:11 +0100
Subject: [PATCH] Maemo: Refine pkill command line.

Reviewed-by: kh1
---
 .../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
index 8dad9734be7..177eafcd01c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
@@ -1427,8 +1427,8 @@ void MaemoRunControl::stop()
     } else {
         stopProcess.kill();
         QStringList cmdArgs;
-        const QString remoteCall = QString::fromLocal8Bit("pkill -f %1; "
-            "sleep 1; pkill -9 -f %1").arg(executableFileName());
+        const QString remoteCall = QString::fromLocal8Bit("pkill -x %1; "
+            "sleep 1; pkill -x -9 %1").arg(executableFileName());
         cmdArgs << "-n" << "-p" << port() << "-l" << runConfig->remoteUserName()
             << runConfig->remoteHostName() << remoteCall;
         stopProcess.start(runConfig->sshCmd(), cmdArgs);
@@ -1586,7 +1586,7 @@ void MaemoDebugRunControl::debuggingFinished()
     if (gdbServer.state() != QProcess::NotRunning) {
         stopProcess.kill();
         const QString remoteCall = QString::fromLocal8Bit("kill %1; sleep 1; "
-            "kill -9 %1; pkill -9 -f gdbserver").arg(inferiorPid);
+            "kill -9 %1; pkill -x -9 gdbserver").arg(inferiorPid);
         QStringList sshArgs;
         sshArgs << "-n" << "-l" << runConfig->remoteUserName() << "-p" << port()
             << runConfig->remoteHostName() << remoteCall;