2 files changed, 12 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
index cbb0309a7c..2e566632cd 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemomanager.cpp
@@ -106,13 +106,20 @@ bool MaemoManager::isValidMaemoQtVersion(const QtVersion *version) const
     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
 
-    QProcess madAdminProc;
     madAdminProc.start(madAdminCommand, arguments);
     if (!madAdminProc.waitForStarted() || !madAdminProc.waitForFinished())
         return false;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
index a508773fd1..81024b2188 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoqemumanager.cpp
@@ -678,6 +678,10 @@ QString MaemoQemuManager::runtimeForQtVersion(const QString &qmakeCommand) const
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     env.insert("HOME",
         QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
+    env.insert(QLatin1String("PATH"),
+        QDir::toNativeSeparators(madRoot % QLatin1String("/bin"))
+        % QLatin1Char(';') % env.value(QLatin1String("PATH")));
+
     madProc.setProcessEnvironment(env);
 
     arguments.prepend(madCommand);