diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-04-14 17:45:23 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-04-16 16:31:24 +0200 |
| commit | 04ce34886f5fcc90a99bc59cc8860aaa8a9c7643 (patch) | |
| tree | fd3744c2687d13cb17c61805c9c43230b1cc08bc | |
| parent | edfa3a418f6d93f4fa623e491b231993d7c34790 (diff) | |
| download | qt-creator-04ce34886f5fcc90a99bc59cc8860aaa8a9c7643.tar.gz | |
Handle qmake with or without trailing .exe
Handle qmake with or without trailing .exe on windows. Looks like the
extension got lost recently in the generated Makefiles.
Reviewed-by: dt
(cherry picked from commit 5a97f79e0bafc56d9403d5dfbdf5eda204efe4ce)
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 73620ffa16..daad29b40e 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -750,6 +750,8 @@ QString QtVersionManager::findQMakeBinaryFromMakefile(const QString &directory) QString qmakePath = qmake.filePath(); #ifdef Q_OS_WIN qmakePath = qmakePath.toLower(); + if (!qmakePath.endsWith(QLatin1String(".exe"))) + qmakePath.append(QLatin1String(".exe")); #endif // Is qmake still installed? if (QFile::exists(qmakePath)) |