diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-08 17:23:30 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-15 22:43:56 +0000 |
| commit | d442a9a4e672863abd1c1069482f8d8f0bdc7a07 (patch) | |
| tree | 765653fae523ea425c15de4dfac5030086db4b1d /qmake/option.cpp | |
| parent | b5464f42373918518420939226982438b15b3af9 (diff) | |
ensure that QMAKE_QMAKE always ends in .exe on windows
Change-Id: I72d5eda83250a0c33af505005732c3f370a04c57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'qmake/option.cpp')
| -rw-r--r-- | qmake/option.cpp | 8 |
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; |