diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp index 5a80bdee0e415ec064f5882ffc138bf15cf8841f..a7e2856225dd980c21ad02bd2d4b4e5f44ed2bc9 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp @@ -127,6 +127,9 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging) m_deployables.append(Deployable(packageFileName(), QFileInfo(executableOnHost()).canonicalPath(), &MaemoRunConfiguration::wasDeployed)); + m_needsInstall = true; + } else { + m_needsInstall = false; } if (forDebugging && m_runConfig->debuggingHelpersNeedDeployment(m_devConfig.host)) { @@ -317,9 +320,11 @@ QString AbstractMaemoRunControl::remoteInstallCommand() const const QString AbstractMaemoRunControl::targetCmdLinePrefix() const { - return QString::fromLocal8Bit("%1 && %2 chmod u+x %3 && source /etc/profile && ") - .arg(remoteInstallCommand()).arg(remoteSudo()) - .arg(executableFilePathOnTarget()); + const QString &installPrefix = m_needsInstall + ? remoteInstallCommand() + QLatin1String(" && ") + : QString(); + return QString::fromLocal8Bit("%1%2 chmod u+x %3 && source /etc/profile && ") + .arg(installPrefix).arg(remoteSudo()).arg(executableFilePathOnTarget()); } QString AbstractMaemoRunControl::targetCmdLineSuffix() const diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h index 050a191f3061e244d226887363e5c5342bf15035..c455f4da32cf8842bb94a6c9056d2c36e5f52eb6 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.h @@ -125,6 +125,7 @@ private: updateFunc updateTimestamp; }; QList<Deployable> m_deployables; + bool m_needsInstall; }; class MaemoRunControl : public AbstractMaemoRunControl