summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r--qmake/option.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 52bd10bfee..fb49f5a100 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -313,6 +313,10 @@ Option::init(int argc, char **argv)
if(argc && argv) {
QString argv0 = argv[0];
+#ifdef Q_OS_WIN
+ if (!argv0.endsWith(QLatin1String(".exe"), Qt::CaseInsensitive))
+ argv0 += QLatin1String(".exe");
+#endif
if(Option::qmake_mode == Option::QMAKE_GENERATE_NOTHING)
Option::qmake_mode = default_mode(argv0);
if(!argv0.isEmpty() && !QFileInfo(argv0).isRelative()) {
@@ -336,10 +340,6 @@ Option::init(int argc, char **argv)
if ((*p).isEmpty())
continue;
QString candidate = currentDir.absoluteFilePath(*p + QLatin1Char('/') + argv0);
-#ifdef Q_OS_WIN
- if (!candidate.endsWith(QLatin1String(".exe")))
- candidate += QLatin1String(".exe");
-#endif
if (QFile::exists(candidate)) {
globals->qmake_abslocation = candidate;
break;