Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
24a98fea
Commit
24a98fea
authored
Nov 18, 2009
by
ck
Browse files
Maemo: Refine pkill command line.
Reviewed-by: kh1
parent
d8ada46f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View file @
24a98fea
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment