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

Maemo: Fix madlist crashing due to missing DLL on Windows.

Browse Source 
Reviewed-by: kh
This commit is contained in:
Friedemann Kleint
2010-09-08 12:47:34 +02:00
parent 7528b3b022
commit a29a5b437d
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,13 +106,20 @@ bool MaemoManager::isValidMaemoQtVersion(const QtVersion *version) const
if (!QFileInfo(madAdminCommand).exists()) if (!QFileInfo(madAdminCommand).exists())
return false; return false;
QProcess madAdminProc;
QStringList arguments(QLatin1String("list")); QStringList arguments(QLatin1String("list"));
#ifdef Q_OS_WIN #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); arguments.prepend(madAdminCommand);
madAdminCommand = dir.absolutePath() + QLatin1String("/bin/sh.exe"); madAdminCommand = dir.absolutePath() + QLatin1String("/bin/sh.exe");
#endif #endif
QProcess madAdminProc;
madAdminProc.start(madAdminCommand, arguments); madAdminProc.start(madAdminCommand, arguments);
if (!madAdminProc.waitForStarted() || !madAdminProc.waitForFinished()) if (!madAdminProc.waitForStarted() || !madAdminProc.waitForFinished())
return false; return false;

4
src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
View File

@@ -678,6 +678,10 @@ QString MaemoQemuManager::runtimeForQtVersion(const QString &qmakeCommand) const
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("HOME", env.insert("HOME",
QDesktopServices::storageLocation(QDesktopServices::HomeLocation)); QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
env.insert(QLatin1String("PATH"),
QDir::toNativeSeparators(madRoot % QLatin1String("/bin"))
% QLatin1Char(';') % env.value(QLatin1String("PATH")));
madProc.setProcessEnvironment(env); madProc.setProcessEnvironment(env);
arguments.prepend(madCommand); arguments.prepend(madCommand);