diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2011-01-27 16:31:11 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2011-01-27 16:31:11 (GMT) |
| commit | d70d17a8ebea25a836e0fb101796cb70d5ca5efd (patch) | |
| tree | 0029a39fd51caf709a0e0086dc3da3dbe21ad929 /mkspecs/features/qt_functions.prf | |
| parent | bbd87cfe022fab15a5cac555ce155f9caa27ff06 (diff) | |
| parent | 91f9b95b931f441e209ecb12c620e1657810f338 (diff) | |
| download | Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.zip Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.tar.gz Qt-d70d17a8ebea25a836e0fb101796cb70d5ca5efd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -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) } |