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
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From ec732f018880f5f80eaf8eddb0913b8237d33696 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Tue, 30 Nov 2010 11:33:48 -0600
Subject: [PATCH] Add qt_help.pri and sync.profile for QtHelp
Also make sure that QtHelp can see its own header files from the
syncqted module include path, and include qbase.pri from the
proper location.
---
qttools/modules/qt_help.pri | 9 +++++++++
qttools/src/assistant/lib/lib.pro | 5 ++++-
qttools/sync.profile | 12 ++++++++++++
3 files changed, 25 insertions(+), 1 deletions(-)
create mode 100644 qttools/modules/qt_help.pri
create mode 100644 qttools/sync.profile
diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri
new file mode 100644
index 0000000..a0028ff
--- /dev/null
+++ b/qttools/modules/qt_help.pri
@@ -0,0 +1,9 @@
+QT_HELP_VERSION = $$QT_VERSION
+QT_HELP_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_HELP_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_HELP_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.help.name = QtHelp
+QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
+QT.help.libs = $$QT_MODULE_LIB_BASE
+QT.help.depends = network xml sql
diff --git a/qttools/src/assistant/lib/lib.pro b/qttools/src/assistant/lib/lib.pro
index 26d3456..2507d16 100644
--- a/qttools/src/assistant/lib/lib.pro
+++ b/qttools/src/assistant/lib/lib.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
QT += sql \
xml \
network
@@ -7,12 +9,13 @@ DEFINES += QHELP_LIB \
QT_CLUCENE_SUPPORT
CONFIG += qt \
warn_on
-include(../../../src/qbase.pri)
+include($$QT_SOURCE_TREE/src/qbase.pri)
QMAKE_TARGET_PRODUCT = Help
QMAKE_TARGET_DESCRIPTION = Help \
application \
framework.
DEFINES -= QT_ASCII_CAST_WARNINGS
+INCLUDEPATH += $$QT.help.includes
qclucene = QtCLucene$${QT_LIBINFIX}
if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
mac:qclucene = $${qclucene}_debug
diff --git a/qttools/sync.profile b/qttools/sync.profile
new file mode 100644
index 0000000..c6aaf0e
--- /dev/null
+++ b/qttools/sync.profile
@@ -0,0 +1,12 @@
+%modules = ( # path to module name map
+ "QtHelp" => "$basedir/src/assistant/lib",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+);
+%classnames = (
+);
+%mastercontent = (
+);
+%modulepris = (
+ "QtHelp" => "$basedir/modules/qt_help.pri",
+);
--
1.7.3.2.343.g7d43d
|
