From 26aec743590c820eb290a40a53f3c63df79866bc Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Tue, 24 Aug 2010 17:41:19 +0200
Subject: [PATCH] Maemo: Some adaptations for Harmattan.
Reviewed-by: kh1
---
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp | 6 +++---
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp | 4 ++--
src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index cd01c16eb7b..c3685e56bc6 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -227,9 +227,9 @@ void MaemoDeployStep::stop()
if (remoteProcessRunning) {
const QByteArray programToKill
- = m_currentDeviceDeployAction ? "cp" : "dpkg";
- const QByteArray cmdLine = "pkill -x " + programToKill
- + "; sleep 1; pkill -x -9 " + programToKill;
+ = m_currentDeviceDeployAction ? "/bin/cp" : "/usr/bin/dpkg";
+ const QByteArray cmdLine = "pkill " + programToKill
+ + "; sleep 1; pkill -9 " + programToKill;
SshRemoteProcess::Ptr killProc
= m_connection->createRemoteProcess(cmdLine);
killProc->start();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
index b1e7ac8c13c..8a1ee88a6c7 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
@@ -48,8 +48,8 @@ QString MaemoGlobal::remoteSudo()
QString MaemoGlobal::remoteCommandPrefix(const QString &commandFilePath)
{
- return QString::fromLocal8Bit("%1 chmod a+x %2 && source /etc/profile && DISPLAY=:0.0 ")
- .arg(remoteSudo()).arg(commandFilePath);
+ return QString::fromLocal8Bit("%1 chmod a+x %2 && source /etc/profile; "
+ "source /home/user/.profile; ").arg(remoteSudo(), commandFilePath);
}
QString MaemoGlobal::remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
index bd9f61ccb03..a53c41f3c14 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
@@ -144,8 +144,8 @@ void MaemoSshRunner::cleanup(bool initialCleanup)
QString niceKill;
QString brutalKill;
foreach (const QString &proc, m_procsToKill) {
- niceKill += QString::fromLocal8Bit("pkill -x %1;").arg(proc);
- brutalKill += QString::fromLocal8Bit("pkill -x -9 %1;").arg(proc);
+ niceKill += QString::fromLocal8Bit("pkill %1\\$;").arg(proc);
+ brutalKill += QString::fromLocal8Bit("pkill -9 %1\\$;").arg(proc);
}
QString remoteCall = niceKill + QLatin1String("sleep 1; ") + brutalKill;
remoteCall.remove(remoteCall.count() - 1, 1); // Get rid of trailing semicolon.
--
GitLab