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

Maemo: source all relevant profiles and ignore non-existing ones.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
Christian Kandeler
2010-09-13 16:50:30 +02:00
parent 8194d2287d
commit 947f0f3a30
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,8 +48,18 @@ QString MaemoGlobal::remoteSudo()
QString MaemoGlobal::remoteCommandPrefix(const QString &commandFilePath)
{
return QString::fromLocal8Bit("%1 chmod a+x %2 && source /etc/profile; "
"source /home/user/.profile; ").arg(remoteSudo(), commandFilePath);
return QString::fromLocal8Bit("%1 chmod a+x %2; %3; ")
.arg(remoteSudo(), commandFilePath, remoteSourceProfilesCommand());
}
QString MaemoGlobal::remoteSourceProfilesCommand()
{
const QList<QByteArray> profiles = QList<QByteArray>() << "/etc/profile"
<< "/home/user/.profile" << "~/.profile";
QByteArray remoteCall(":");
foreach (const QByteArray &profile, profiles)
remoteCall += "; test -f " + profile + " && source " + profile;
return QString::fromAscii(remoteCall);
}
QString MaemoGlobal::remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list)