diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-13 17:34:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 00:59:08 +0200 |
| commit | fb8a6297f416e0367bbe0011e9b0ac52a6d7748d (patch) | |
| tree | a27a08ff095e7d7afaae2a3e37f95d3542e63d3a /mkspecs/features/qt_functions.prf | |
| parent | 8ca1c93a15b03c8bcba56bfa203e973fcb185c10 (diff) | |
remove 3rd parameter from qtPrepareTool()
it's been superseded by the QTTOOL.* module stuff.
Change-Id: I01c9fc3ebbb22111bfb03f82693c7cf08b5fc9d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 3b1a8d2783..e40e56df20 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -166,12 +166,7 @@ defineTest(qtAddModules) { defineTest(qtPrepareTool) { $$1 = $$eval(QT_TOOL.$${2}.command) isEmpty($$1) { - MODBASE = $$[QT_HOST_BINS/get] - count(ARGS, 2, greaterThan) { - isEmpty(QT.$${3}.bins):warning("No QT.$${3}.bins, module path ignored for qtPrepareTool($$1, $$2, $$3)") - else:MODBASE = $$eval(QT.$${3}.bins) - } - isEmpty($$1):$$1 = $$MODBASE/$$2 + $$1 = $$[QT_HOST_BINS/get]/$$2 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { exists($$eval($$1).bat) { $$1 = $$eval($$1).bat |