diff --git a/src/plugins/remotelinux/maemoglobal.cpp b/src/plugins/remotelinux/maemoglobal.cpp index 29afa77e93be136c97ade66e38a775a07af0247d..95a90e04a62accd2a6c7af61192ec5b809ccffdf 100644 --- a/src/plugins/remotelinux/maemoglobal.cpp +++ b/src/plugins/remotelinux/maemoglobal.cpp @@ -170,11 +170,9 @@ QString MaemoGlobal::remoteSudo(const QString &osType, const QString &uname) return QString(); // Using sudo would open a can of worms. } -QString MaemoGlobal::remoteCommandPrefix(const QString &osType, const QString &userName, - const QString &commandFilePath) +QString MaemoGlobal::remoteCommandPrefix(const QString &osType) { - QString prefix = QString::fromLocal8Bit("%1 chmod a+x %2; %3; ") - .arg(remoteSudo(osType, userName), commandFilePath, remoteSourceProfilesCommand()); + QString prefix = QString::fromLocal8Bit("%1; ").arg(remoteSourceProfilesCommand()); if (osType != LinuxDeviceConfiguration::Maemo5OsType && osType != LinuxDeviceConfiguration::HarmattanOsType) { prefix += QLatin1String("DISPLAY=:0.0 "); diff --git a/src/plugins/remotelinux/maemoglobal.h b/src/plugins/remotelinux/maemoglobal.h index db87045754ac004879b69d535a56ddbad240b1ef..741f4baea1ab3da803f758f935e2ee744a9ca7a0 100644 --- a/src/plugins/remotelinux/maemoglobal.h +++ b/src/plugins/remotelinux/maemoglobal.h @@ -108,8 +108,7 @@ public: static QString devrootshPath(); static int applicationIconSize(const QString &osType); static QString remoteSudo(const QString &osType, const QString &uname); - static QString remoteCommandPrefix(const QString &osType, - const QString &userName, const QString &commandFilePath); + static QString remoteCommandPrefix(const QString &osType); static QString remoteEnvironment(const QList<Utils::EnvironmentItem> &list); static QString remoteSourceProfilesCommand(); static QString failedToConnectToServerMessage(const QSharedPointer<Utils::SshConnection> &connection, diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 4833e4e391abfe35915364f4a7b847c25b65c3b6..8d70dac2e0a4da8a7e37fa272e3ab57f23487857 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -310,8 +310,7 @@ QString RemoteLinuxRunConfiguration::commandPrefix() const return QString(); return QString::fromLocal8Bit("%1 %2") - .arg(MaemoGlobal::remoteCommandPrefix(deviceConfig()->osType(), - deviceConfig()->sshParameters().userName, remoteExecutableFilePath())) + .arg(MaemoGlobal::remoteCommandPrefix(deviceConfig()->osType())) .arg(MaemoGlobal::remoteEnvironment(userEnvironmentChanges())); }