diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-27 13:53:44 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-12-12 17:35:27 +0000 |
| commit | 69f6d3bd44e4e2d36ef741a1914227f804504141 (patch) | |
| tree | 8f14fcd3eba905c3cf4b6093ff034425a6e7b009 /mkspecs | |
| parent | 4e54ac7c8951c87846dccd12b0801eb31fa9dd84 (diff) | |
configure: fix $$qtConfFindInPath() on windows
uses of this function (or the "files" stanza in configure.json) which
don't explicitly target windows don't specify the .exe extension, so we
need to add it automatically if it's missing.
Task-number: QTBUG-57436
Change-Id: I1994378399bc3466c32ee065e752516f42652975
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index d071e51769..e2e341770e 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -378,6 +378,7 @@ defineReplace(qtConfFindInPathList) { defineReplace(qtConfFindInPath) { ensurePathEnv() + equals(QMAKE_HOST.os, Windows):!contains(1, .*\\.exe): 1 = $${1}.exe return($$qtConfFindInPathList($$1, $$2 $$QMAKE_PATH_ENV)) } |