1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed path references to ActiveQt.

Browse Source
This commit is contained in:
axis 2011-01-27 09:47:08 +01:00
parent 3bfa70fef9
commit 59db0a203d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/features/win32/qaxcontainer.prf
View File

@ -8,6 +8,10 @@
LIBS += -lQAxContainer
}
QMAKE_LIBDIR += $$QT.activeqt.libs
INCLUDEPATH += $$QT.activeqt.includes
QMAKE_LIBS += $$QMAKE_LIBS_GUI
qtPrepareTool(QMAKE_DUMPCPP, dumpcpp)
dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE}

3
mkspecs/features/win32/qaxserver.prf
View File

@ -7,6 +7,7 @@ ACTIVEQT_VERSION = $$VERSION
isEmpty(ACTIVEQT_VERSION):ACTIVEQT_VERSION = 1.0
DEFINES += QAXSERVER
INCLUDEPATH += $$QT.activeqt.includes
contains(TEMPLATE, "vc.*") {
ACTIVEQT_IDC = $${QMAKE_IDC} ### Qt5: remove me
@ -56,4 +57,6 @@ qt:!target_qt {
QMAKE_LIBS_QT_ENTRY = -lQAxServer
}
dll:QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY
QMAKE_LIBDIR += $$QT.activeqt.libs
QMAKE_LIBS += $$QMAKE_LIBS_GUI
}