From fb8a6297f416e0367bbe0011e9b0ac52a6d7748d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 13 Sep 2012 17:34:35 +0200 Subject: [PATCH] remove 3rd parameter from qtPrepareTool() it's been superseded by the QTTOOL.* module stuff. Change-Id: I01c9fc3ebbb22111bfb03f82693c7cf08b5fc9d4 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_functions.prf | 7 +------ mkspecs/features/win32/qaxserver.prf | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 3b1a8d2..e40e56d 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 diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf index fafd868..748da22 100644 --- a/mkspecs/features/win32/qaxserver.prf +++ b/mkspecs/features/win32/qaxserver.prf @@ -9,7 +9,7 @@ isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0 DEFINES += QAXSERVER INCLUDEPATH += $$QT.activeqt.includes -qtPrepareTool(QMAKE_IDC, idc, activeqt) +qtPrepareTool(QMAKE_IDC, idc) contains(TEMPLATE, "vc.*") { ACTIVEQT_IDC = $${QMAKE_IDC} ACTIVEQT_IDL = $${QMAKE_IDL} -- 2.7.4