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

Maemo: Get rid of some environment setting redundancies.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
Christian Kandeler
2010-11-26 17:53:13 +01:00
parent 1ff82ca8e4
commit 16c919462b
5 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,12 @@
#include "maemoglobal.h"
#include <utils/environment.h>
#include <QtCore/QCoreApplication>
#include <QtGui/QDesktopServices>
#include <QtCore/QDir>
#include <QtCore/QProcess>
#include <QtCore/QString>
#define TR(text) QCoreApplication::translate("Qt4ProjectManager::Internal::MaemoGlobal", text)
@@ -104,5 +108,24 @@ bool MaemoGlobal::removeRecursively(const QString &filePath, QString &error)
return true;
}
void MaemoGlobal::callMaddeShellScript(QProcess &proc, const QString &maddeRoot,
const QString &command, const QStringList &args)
{
QString actualCommand = command;
QStringList actualArgs = args;
#ifdef Q_OS_WIN
Utils::Environment env(proc.environment());
env.prependOrSetPath(maddeRoot + QLatin1String("/bin"));
env.prependOrSet(QLatin1String("HOME"),
QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
proc.setEnvironment(env.toStringList());
actualArgs.prepend(command);
actualCommand = maddeRoot + QLatin1String("/bin/sh.exe");
#else
Q_UNUSED(maddeRoot);
#endif
proc.start(actualCommand, actualArgs);
}
} // namespace Internal
} // namespace Qt4ProjectManager