diff options
| author | axis <qt-info@nokia.com> | 2011-01-27 09:47:08 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:56 +0200 |
| commit | 59db0a203dd7675d700dc5d772fb8bdb9dc1d0d5 (patch) | |
| tree | 483bd504822a0e605d8c20cdd527137cd10c55f2 /mkspecs/features/win32 | |
| parent | 3bfa70fef94735efe82aab4a6255b59690b35952 (diff) | |
Changed path references to ActiveQt.
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/qaxcontainer.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/win32/qaxserver.prf | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/win32/qaxcontainer.prf b/mkspecs/features/win32/qaxcontainer.prf index 34c6dfed42..2d0ff851ba 100644 --- a/mkspecs/features/win32/qaxcontainer.prf +++ b/mkspecs/features/win32/qaxcontainer.prf @@ -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} diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf index a6c0869540..678c2ccb83 100644 --- a/mkspecs/features/win32/qaxserver.prf +++ b/mkspecs/features/win32/qaxserver.prf @@ -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 } |