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

Maemo: Refine pkill command line.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2009-11-18 17:01:11 +01:00
parent d8ada46fc4
commit 24a98feada
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -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;