feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Final step to be able to set remote environment.

Browse Source 
Task-number: QTCREATORBUG-1663
Reviewed-by: ck
This commit is contained in:
kh1
2010-07-29 14:42:04 +02:00
parent ebe2fb88f3
commit 4a16cb9c38
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
View File

@@ -52,5 +52,14 @@ QString MaemoGlobal::remoteCommandPrefix(const QString &commandFilePath)
.arg(remoteSudo()).arg(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 Internal
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager

2
src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
View File

@@ -31,6 +31,7 @@
#define MAEMOGLOBAL_H #define MAEMOGLOBAL_H
#include <projectexplorer/buildconfiguration.h> #include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/environment.h>
#include <QtCore/QList> #include <QtCore/QList>
@@ -47,6 +48,7 @@ public:
static QString homeDirOnDevice(const QString &uname); static QString homeDirOnDevice(const QString &uname);
static QString remoteSudo(); static QString remoteSudo();
static QString remoteCommandPrefix(const QString &commandFilePath); static QString remoteCommandPrefix(const QString &commandFilePath);
static QString remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list);
template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *bc) template<class T> static T *buildStep(const ProjectExplorer::BuildConfiguration *bc)
{ {

6
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -113,8 +113,10 @@ void MaemoRunControl::startExecution()
{ {
emit appendMessage(this, tr("Starting remote process ..."), false); emit appendMessage(this, tr("Starting remote process ..."), false);
const QString &remoteExe = m_runConfig->remoteExecutableFilePath(); const QString &remoteExe = m_runConfig->remoteExecutableFilePath();
m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3") m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3 %4")
.arg(MaemoGlobal::remoteCommandPrefix(remoteExe)).arg(remoteExe) .arg(MaemoGlobal::remoteCommandPrefix(remoteExe))
.arg(MaemoGlobal::remoteEnvironment(m_runConfig->userEnvironmentChanges()))
.arg(remoteExe)
.arg(m_runConfig->arguments().join(QLatin1String(" "))).toUtf8()); .arg(m_runConfig->arguments().join(QLatin1String(" "))).toUtf8());
} }