From e2c06d5da187a0a081e1e2b70362eed1fbdec943 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Fri, 4 Sep 2009 09:52:14 +0200
Subject: [PATCH] Make conversion to from QTDIR to qmake more reliable.
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 0670547535f..a9b642e1312 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -102,12 +102,20 @@ QtVersionManager::QtVersionManager()
if (isAutodetected)
autodetectionSource = QLatin1String(PATH_AUTODETECTION_SOURCE);
}
-
QString qmakePath = s->value("QMakePath").toString();
if (qmakePath.isEmpty()) {
QString path = s->value("Path").toString();
- if (!path.isEmpty())
- qmakePath = + "/bin/qmake.exe";
+ if (!path.isEmpty()) {
+ foreach(const QString& command, ProjectExplorer::DebuggingHelperLibrary::possibleQMakeCommands())
+ {
+ QFileInfo fi(path + "/bin/" + command);
+ if (fi.exists())
+ {
+ qmakePath = fi.filePath();
+ break;
+ }
+ }
+ }
}
QtVersion *version = new QtVersion(s->value("Name").toString(),
qmakePath,
--
GitLab