Changed path references to ActiveQt.
This commit is contained in:
parent
3bfa70fef9
commit
59db0a203d
@ -8,6 +8,10 @@
|
|||||||
LIBS += -lQAxContainer
|
LIBS += -lQAxContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QMAKE_LIBDIR += $$QT.activeqt.libs
|
||||||
|
INCLUDEPATH += $$QT.activeqt.includes
|
||||||
|
QMAKE_LIBS += $$QMAKE_LIBS_GUI
|
||||||
|
|
||||||
qtPrepareTool(QMAKE_DUMPCPP, dumpcpp)
|
qtPrepareTool(QMAKE_DUMPCPP, dumpcpp)
|
||||||
|
|
||||||
dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE}
|
dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE}
|
||||||
|
@ -7,6 +7,7 @@ ACTIVEQT_VERSION = $$VERSION
|
|||||||
isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0
|
isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0
|
||||||
|
|
||||||
DEFINES += QAXSERVER
|
DEFINES += QAXSERVER
|
||||||
|
INCLUDEPATH += $$QT.activeqt.includes
|
||||||
|
|
||||||
contains(TEMPLATE, "vc.*") {
|
contains(TEMPLATE, "vc.*") {
|
||||||
ACTIVEQT_IDC = $${QMAKE_IDC} ### Qt5: remove me
|
ACTIVEQT_IDC = $${QMAKE_IDC} ### Qt5: remove me
|
||||||
@ -56,4 +57,6 @@ qt:!target_qt {
|
|||||||
QMAKE_LIBS_QT_ENTRY = -lQAxServer
|
QMAKE_LIBS_QT_ENTRY = -lQAxServer
|
||||||
}
|
}
|
||||||
dll:QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
|
dll:QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
|
||||||
|
QMAKE_LIBDIR += $$QT.activeqt.libs
|
||||||
|
QMAKE_LIBS += $$QMAKE_LIBS_GUI
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user