blob: acebbc32366703fa51b44bb8a7b2b48981c66434 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From a7f3d2673743bad6baf16b92c42cc18b2ffc5d02 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 27 Jan 2011 09:47:08 +0100
Subject: [PATCH] Changed path references to ActiveQt.
---
qtbase/mkspecs/features/win32/qaxcontainer.prf | 4 ++++
qtbase/mkspecs/features/win32/qaxserver.prf | 3 +++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/qtbase/mkspecs/features/win32/qaxcontainer.prf b/qtbase/mkspecs/features/win32/qaxcontainer.prf
index 34c6dfe..2d0ff85 100644
--- a/qtbase/mkspecs/features/win32/qaxcontainer.prf
+++ b/qtbase/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/qtbase/mkspecs/features/win32/qaxserver.prf b/qtbase/mkspecs/features/win32/qaxserver.prf
index a6c0869..678c2cc 100644
--- a/qtbase/mkspecs/features/win32/qaxserver.prf
+++ b/qtbase/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
}
--
1.7.3.4
|
