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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
From 6b9f688bb357dde8b7d093764650b5994b13690d Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Thu, 16 Dec 2010 23:34:20 -0600
Subject: [PATCH] Add the source path to the modules .pri file
---
qt3support/modules/qt_qt3support.pri | 1 +
qtkernel/bin/syncqt | 1 +
qtkernel/src/modules/qt_core.pri | 1 +
qtkernel/src/modules/qt_dbus.pri | 1 +
qtkernel/src/modules/qt_gui.pri | 1 +
qtkernel/src/modules/qt_network.pri | 1 +
qtkernel/src/modules/qt_opengl.pri | 1 +
qtkernel/src/modules/qt_openvg.pri | 1 +
qtkernel/src/modules/qt_sql.pri | 1 +
qtkernel/src/modules/qt_svg.pri | 1 +
qtkernel/src/modules/qt_testlib.pri | 1 +
qtkernel/src/modules/qt_xml.pri | 1 +
qtdeclarative/modules/qt_declarative.pri | 1 +
qtscript/modules/qt_script.pri | 1 +
qtscript/modules/qt_scripttools.pri | 1 +
qttools/modules/qt_help.pri | 1 +
qtxmlpatterns/modules/qt_xmlpatterns.pri | 1 +
17 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri
index 400b69c..86d6395 100644
--- a/qt3support/modules/qt_qt3support.pri
+++ b/qt3support/modules/qt_qt3support.pri
@@ -5,6 +5,7 @@ QT_QT3SUPPORT_PATCH_VERSION = $$QT_PATCH_VERSION
QT.qt3support.name = Qt3Support
QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Support
+QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support
QT.qt3support.libs = $$QT_MODULE_LIB_BASE
QT.qt3support.depends = core gui
QT.qt3support.DEFINES = QT3_SUPPORT
diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt
index fa0fbd3..8b69ffb 100755
--- a/qtkernel/bin/syncqt
+++ b/qtkernel/bin/syncqt
@@ -1004,6 +1004,7 @@ foreach my $lib (@modules_to_sync) {
my $modulepriname = basename($modulepri);
my $moduleprifwd = "$qtkerneldir/mkspecs/modules/$modulepriname";
open MODULE_PRI_FILE, ">$moduleprifwd";
+ print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n";
print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n";
print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $out_basedir/lib\n";
print MODULE_PRI_FILE "include($modulepri)\n";
diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri
index e90011a..246fed7 100644
--- a/qtkernel/src/modules/qt_core.pri
+++ b/qtkernel/src/modules/qt_core.pri
@@ -5,5 +5,6 @@ QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION
QT.core.name = QtCore
QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore
+QT.core.sources = $$QT_MODULE_BASE/src/corelib
QT.core.libs = $$QT_MODULE_LIB_BASE
QT.core.depends =
diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri
index b762353..e930949 100644
--- a/qtkernel/src/modules/qt_dbus.pri
+++ b/qtkernel/src/modules/qt_dbus.pri
@@ -5,6 +5,7 @@ QT_DBUS_PATCH_VERSION = $$QT_PATCH_VERSION
QT.dbus.name = QtDBus
QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus
+QT.dbus.sources = $$QT_MODULE_BASE/src/dbus
QT.dbus.libs = $$QT_MODULE_LIB_BASE
QT.dbus.depends = core xml
QT.dbus.CONFIG = dbusadaptors dbusinterfaces
diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri
index f6b9720..0f5da2f 100644
--- a/qtkernel/src/modules/qt_gui.pri
+++ b/qtkernel/src/modules/qt_gui.pri
@@ -5,5 +5,6 @@ QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION
QT.gui.name = QtGui
QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui
+QT.gui.sources = $$QT_MODULE_BASE/src/gui
QT.gui.libs = $$QT_MODULE_LIB_BASE
QT.gui.depends = core network
diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri
index d794b2e..4a9ae46 100644
--- a/qtkernel/src/modules/qt_network.pri
+++ b/qtkernel/src/modules/qt_network.pri
@@ -5,5 +5,6 @@ QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION
QT.network.name = QtNetwork
QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork
+QT.network.sources = $$QT_MODULE_BASE/src/network
QT.network.libs = $$QT_MODULE_LIB_BASE
QT.network.depends = core
diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri
index 9eff7ef..71cfa2f 100644
--- a/qtkernel/src/modules/qt_opengl.pri
+++ b/qtkernel/src/modules/qt_opengl.pri
@@ -5,6 +5,7 @@ QT_OPENGL_PATCH_VERSION = $$QT_PATCH_VERSION
QT.opengl.name = QtOpenGL
QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL
+QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
QT.opengl.libs = $$QT_MODULE_LIB_BASE
QT.opengl.depends = core gui
QT.opengl.CONFIG = opengl
diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri
index e9fa17f..bd50abb 100644
--- a/qtkernel/src/modules/qt_openvg.pri
+++ b/qtkernel/src/modules/qt_openvg.pri
@@ -5,6 +5,7 @@ QT_OPENVG_PATCH_VERSION = $$QT_PATCH_VERSION
QT.openvg.name = QtOpenVG
QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG
+QT.openvg.sources = $$QT_MODULE_BASE/src/openvg
QT.openvg.libs = $$QT_MODULE_LIB_BASE
QT.openvg.depends = core gui
QT.openvg.CONFIG = openvg
diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri
index 93cac45..4ec18f0 100644
--- a/qtkernel/src/modules/qt_sql.pri
+++ b/qtkernel/src/modules/qt_sql.pri
@@ -5,5 +5,6 @@ QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION
QT.sql.name = QtSql
QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql
+QT.sql.sources = $$QT_MODULE_BASE/src/sql
QT.sql.libs = $$QT_MODULE_LIB_BASE
QT.sql.depends = core
diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri
index 27b4fb0..1be80f6 100644
--- a/qtkernel/src/modules/qt_svg.pri
+++ b/qtkernel/src/modules/qt_svg.pri
@@ -5,5 +5,6 @@ QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION
QT.svg.name = QtSvg
QT.svg.includes = $$QT_MODULE_INCLUDE_BASE/QtSvg
+QT.svg.sources = $$QT_MODULE_BASE/src/svg
QT.svg.libs = $$QT_MODULE_LIB_BASE
QT.svg.depends = core gui
diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri
index 05db9db..ffca9f0 100644
--- a/qtkernel/src/modules/qt_testlib.pri
+++ b/qtkernel/src/modules/qt_testlib.pri
@@ -5,6 +5,7 @@ QT_TEST_PATCH_VERSION = $$QT_PATCH_VERSION
QT.testlib.name = QtTest
QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest
+QT.testlib.sources = $$QT_MODULE_BASE/src/testlib
QT.testlib.libs = $$QT_MODULE_LIB_BASE
QT.testlib.depends = core
QT.testlib.CONFIG = console
diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri
index 06fc5fc..4932ae5 100644
--- a/qtkernel/src/modules/qt_xml.pri
+++ b/qtkernel/src/modules/qt_xml.pri
@@ -5,5 +5,6 @@ QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION
QT.xml.name = QtXml
QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml
+QT.xml.sources = $$QT_MODULE_BASE/src/xml
QT.xml.libs = $$QT_MODULE_LIB_BASE
QT.xml.depends = core
diff --git a/qtdeclarative/modules/qt_declarative.pri b/qtdeclarative/modules/qt_declarative.pri
index 5fb8c25..1ddd14a 100644
--- a/qtdeclarative/modules/qt_declarative.pri
+++ b/qtdeclarative/modules/qt_declarative.pri
@@ -5,5 +5,6 @@ QT_DECLARATIVE_PATCH_VERSION = $$QT_PATCH_VERSION
QT.declarative.name = QtDeclarative
QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDeclarative
+QT.declarative.sources = $$QT_MODULE_BASE/src/declarative
QT.declarative.libs = $$QT_MODULE_LIB_BASE
QT.declarative.depends = gui script network
diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri
index d0dcd2d..f44224d 100644
--- a/qtscript/modules/qt_script.pri
+++ b/qtscript/modules/qt_script.pri
@@ -5,5 +5,6 @@ QT_SCRIPT_PATCH_VERSION = $$QT_PATCH_VERSION
QT.script.name = QtScript
QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript
+QT.script.sources = $$QT_MODULE_BASE/src/script
QT.script.libs = $$QT_MODULE_LIB_BASE
QT.script.depends = core
diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri
index a39e22a..124a930 100644
--- a/qtscript/modules/qt_scripttools.pri
+++ b/qtscript/modules/qt_scripttools.pri
@@ -5,5 +5,6 @@ QT_SCRIPTTOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
QT.scripttools.name = QtScriptTools
QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScriptTools
+QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools
QT.scripttools.libs = $$QT_MODULE_LIB_BASE
QT.scripttools.depends = script gui network
diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri
index a0028ff..8812d5e 100644
--- a/qttools/modules/qt_help.pri
+++ b/qttools/modules/qt_help.pri
@@ -5,5 +5,6 @@ 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.sources = $$QT_MODULE_BASE/src/assistant/lib
QT.help.libs = $$QT_MODULE_LIB_BASE
QT.help.depends = network xml sql
diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri
index ac83022..a11c06a 100644
--- a/qtxmlpatterns/modules/qt_xmlpatterns.pri
+++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri
@@ -5,5 +5,6 @@ QT_XMLPATTERNS_PATCH_VERSION = $$QT_PATCH_VERSION
QT.xmlpatterns.name = QtXmlPatterns
QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns
+QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns
QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE
QT.xmlpatterns.depends = core network
--
1.7.3.2.343.g7d43d
|
