Changed path references to ActiveQt.
authoraxis <qt-info@nokia.com>
Thu, 27 Jan 2011 08:47:08 +0000 (09:47 +0100)
committeraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 10:05:56 +0000 (12:05 +0200)
mkspecs/features/win32/qaxcontainer.prf
mkspecs/features/win32/qaxserver.prf

index 34c6dfe..2d0ff85 100644 (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}
index a6c0869..678c2cc 100644 (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
 }