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

20
src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
View File

@@ -32,6 +32,7 @@
#include "maemoconstants.h"
#include "maemodeploystepfactory.h"
#include "maemodeviceconfigurations.h"
#include "maemoglobal.h"
#include "maemopackagecreationfactory.h"
#include "maemopublishingwizardfactories.h"
#include "maemoqemumanager.h"
@@ -106,25 +107,14 @@ bool MaemoManager::isValidMaemoQtVersion(const QtVersion *version) const
QDir dir(path);
const QByteArray target = dir.dirName().toAscii();
dir.cdUp(); dir.cdUp();
QString madAdminCommand(dir.absolutePath() + QLatin1String("/bin/mad-admin"));
const QString madAdminCommand(dir.absolutePath() + QLatin1String("/bin/mad-admin"));
if (!QFileInfo(madAdminCommand).exists())
return false;
QProcess madAdminProc;
QStringList arguments(QLatin1String("list"));
#ifdef Q_OS_WIN
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert(QLatin1String("PATH"),
QDir::toNativeSeparators(dir.absolutePath() % QLatin1String("/bin"))
% QLatin1Char(';') % env.value(QLatin1String("PATH")));
madAdminProc.setProcessEnvironment(env);
arguments.prepend(madAdminCommand);
madAdminCommand = dir.absolutePath() + QLatin1String("/bin/sh.exe");
#endif
madAdminProc.start(madAdminCommand, arguments);
const QStringList arguments(QLatin1String("list"));
MaemoGlobal::callMaddeShellScript(madAdminProc, dir.absolutePath(),
madAdminCommand, arguments);
if (!madAdminProc.waitForStarted() || !madAdminProc.waitForFinished())
return false;