diff options
| author | axis <qt-info@nokia.com> | 2010-10-05 11:36:49 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-10-21 09:12:17 (GMT) |
| commit | ac439ba6a12b2d5029783d73e1c879db7dc269a5 (patch) | |
| tree | c310c521ae1028ba52244b4db24097d501ceaa97 /mkspecs/features | |
| parent | 185abbd1dcaf2d882f2225a874bafafb9815a8eb (diff) | |
| download | Qt-ac439ba6a12b2d5029783d73e1c879db7dc269a5.zip Qt-ac439ba6a12b2d5029783d73e1c879db7dc269a5.tar.gz Qt-ac439ba6a12b2d5029783d73e1c879db7dc269a5.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 afc708a..e5ef5a1 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -87,6 +87,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) } |