From 6a41fa832e76b489adef9b26ee5cc7f9a83953cc Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Thu, 5 Sep 2013 13:15:04 +0200
Subject: 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>
---
 qmake/option.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'qmake/option.cpp')

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;
-- 
cgit v1.2.3