diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp index fcacff25858bb85b1f39cf07840c8e4baa3bf7c1..f3ff1273279b1d22b58fc188afc30d49561dd4a2 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp @@ -52,5 +52,14 @@ QString MaemoGlobal::remoteCommandPrefix(const QString &commandFilePath) .arg(remoteSudo()).arg(commandFilePath); } +QString MaemoGlobal::remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list) +{ + QString env; + QString placeHolder = QLatin1String("%1=%2 "); + foreach (const ProjectExplorer::EnvironmentItem &item, list) + env.append(placeHolder.arg(item.name).arg(item.value)); + return env.mid(0, env.size() - 1); +} + } // namespace Internal } // namespace Qt4ProjectManager diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h index ad8f5c6f0f533a28daf037b663632fc7992a7095..c8f9225b5185cae15dd10433afa745520dc1bae3 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h @@ -31,6 +31,7 @@ #define MAEMOGLOBAL_H #include <projectexplorer/buildconfiguration.h> +#include <projectexplorer/environment.h> #include <QtCore/QList> @@ -47,6 +48,7 @@ public: static QString homeDirOnDevice(const QString &uname); static QString remoteSudo(); static QString remoteCommandPrefix(const QString &commandFilePath); + static QString remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list); template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *bc) { diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp index 515e2230414d506fd204797e76bbfc817de279ba..df08195fc2579a44adaf1f4a7aea1e569db0253c 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp @@ -113,8 +113,10 @@ void MaemoRunControl::startExecution() { emit appendMessage(this, tr("Starting remote process ..."), false); const QString &remoteExe = m_runConfig->remoteExecutableFilePath(); - m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3") - .arg(MaemoGlobal::remoteCommandPrefix(remoteExe)).arg(remoteExe) + m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3 %4") + .arg(MaemoGlobal::remoteCommandPrefix(remoteExe)) + .arg(MaemoGlobal::remoteEnvironment(m_runConfig->userEnvironmentChanges())) + .arg(remoteExe) .arg(m_runConfig->arguments().join(QLatin1String(" "))).toUtf8()); }