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>bb10
parent
8ca1c93a15
commit
fb8a6297f4
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
Loading…
Reference in New Issue