summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-09-05 13:15:04 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-09 11:16:33 +0200
commit6a41fa832e76b489adef9b26ee5cc7f9a83953cc (patch)
tree128cb7a3a4dbf1d44ed16805f2cdb48b7d3a232f
parent77056f91cd1dd9e88df04ff646c98213270b49b9 (diff)
fix finding qmake.exe when called on the command line as ... qmake.exe
Task-number: QTBUG-33333 Change-Id: I026659fc779d1cf2fde46b5bcb4990b151b8c51e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--qmake/option.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 4f7cdb34a2..9fbb2b9389 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -347,7 +347,8 @@ Option::init(int argc, char **argv)
continue;
QString candidate = currentDir.absoluteFilePath(*p + QLatin1Char('/') + argv0);
#ifdef Q_OS_WIN
- candidate += ".exe";
+ if (!candidate.endsWith(QLatin1String(".exe")))
+ candidate += QLatin1String(".exe");
#endif
if (QFile::exists(candidate)) {
globals->qmake_abslocation = candidate;