diff options
| author | axis <qt-info@nokia.com> | 2010-10-05 11:36:49 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-01-18 14:42:22 (GMT) |
| commit | 3fc81fe9bff2b35efd04955ae2ce5399ae1a91f0 (patch) | |
| tree | 2046d0ecf7506f26a01512b3b9741e2578414a1b /mkspecs/features | |
| parent | ae4b284a0e9fddf052fe8043940a995533ffe7c8 (diff) | |
| download | Qt-3fc81fe9bff2b35efd04955ae2ce5399ae1a91f0.zip Qt-3fc81fe9bff2b35efd04955ae2ce5399ae1a91f0.tar.gz Qt-3fc81fe9bff2b35efd04955ae2ce5399ae1a91f0.tar.bz2 | |
Added detection of bat files to the qtPrepareTool function.
Not all tools end with .exe. Some also end in .bat.
RevBy: Oswald Buddenhagen
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 59d49c6..964e13b 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -94,6 +94,12 @@ defineTest(qtPrepareTool) { else:$$1 = $$[QT_INSTALL_BINS]/$$2 } $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.exe$):$$1 = $$eval($$1).exe + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { + exists($$eval($$1).bat) { + $$1 = $$eval($$1).bat + } else { + $$1 = $$eval($$1).exe + } + } export($$1) } |