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

Handle qmake with or without trailing .exe

Browse Source 
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 5a97f79e0b)
This commit is contained in:
Tobias Hunger
2010-04-14 17:45:23 +02:00
committed by con
parent edfa3a418f
commit 04ce34886f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -750,6 +750,8 @@ QString QtVersionManager::findQMakeBinaryFromMakefile(const QString &directory)
QString qmakePath = qmake.filePath(); QString qmakePath = qmake.filePath();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
qmakePath = qmakePath.toLower(); qmakePath = qmakePath.toLower();
if (!qmakePath.endsWith(QLatin1String(".exe")))
qmakePath.append(QLatin1String(".exe"));
#endif #endif
// Is qmake still installed? // Is qmake still installed?
if (QFile::exists(qmakePath)) if (QFile::exists(qmakePath))