From: axis <qt-info@nokia.com>
Date: Thu, 27 Jan 2011 08:47:08 +0000 (+0100)
Subject: Changed path references to ActiveQt.
X-Git-Tag: qt-v5.0.0-alpha1~4379
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59db0a203dd7675d700dc5d772fb8bdb9dc1d0d5;p=profile%2Fivi%2Fqtbase.git

Changed path references to ActiveQt.
---

diff --git a/mkspecs/features/win32/qaxcontainer.prf b/mkspecs/features/win32/qaxcontainer.prf
index 34c6dfe..2d0ff85 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 a6c0869..678c2cc 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
 }