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
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
|
From 49fbf0927c8a3d243040f8b9555696ac87348f85 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Thu, 17 Mar 2011 10:57:48 +0100
Subject: [PATCH] Added QT.<module>.imports support to module profiles.
---
activeqt/modules/qt_activeqt.pri | 1 +
phonon/modules/qt_phonon.pri | 1 +
qt3support/modules/qt_qt3support.pri | 1 +
qtkernel/bin/syncqt | 1 +
qtkernel/mkspecs/features/qt_config.prf | 1 +
qtkernel/src/modules/qt_core.pri | 1 +
qtkernel/src/modules/qt_dbus.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_testlib.pri | 1 +
qtkernel/src/modules/qt_uilib.pri | 1 +
qtkernel/src/modules/qt_uitools.pri | 1 +
qtkernel/src/modules/qt_xml.pri | 1 +
qtmultimedia/modules/qt_multimedia.pri | 1 +
qtquick/modules/qt_declarative.pri | 1 +
qtscript/modules/qt_script.pri | 1 +
qtscript/modules/qt_scripttools.pri | 1 +
qtsvg/modules/qt_svg.pri | 1 +
qttools/modules/qt_clucene.pri | 1 +
qttools/modules/qt_designer.pri | 1 +
qttools/modules/qt_help.pri | 1 +
qtxmlpatterns/modules/qt_xmlpatterns.pri | 1 +
24 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/activeqt/modules/qt_activeqt.pri b/activeqt/modules/qt_activeqt.pri
index fe6a421..c10d06d 100644
--- a/activeqt/modules/qt_activeqt.pri
+++ b/activeqt/modules/qt_activeqt.pri
@@ -9,6 +9,7 @@ QT.activeqt.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/ActiveQ
QT.activeqt.private_includes = $$QT_MODULE_INCLUDE_BASE/ActiveQt/private
QT.activeqt.sources = $$QT_MODULE_BASE/src/activeqt
QT.activeqt.libs = $$QT_MODULE_LIB_BASE
+QT.activeqt.imports = $$QT_MODULE_IMPORT_BASE
QT.activeqt.depends = gui
QT.activeqt.DEFINES = QT_ACTIVEQT_LIB
diff --git a/phonon/modules/qt_phonon.pri b/phonon/modules/qt_phonon.pri
index 24af6d6..af1b222 100644
--- a/phonon/modules/qt_phonon.pri
+++ b/phonon/modules/qt_phonon.pri
@@ -4,6 +4,7 @@ QT.phonon.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/phonon
QT.phonon.private_includes = $$QT_MODULE_INCLUDE_BASE/phonon/private
QT.phonon.sources = $$QT_MODULE_BASE/src/3rdparty/phonon/phonon
QT.phonon.libs = $$QT_MODULE_LIB_BASE
+QT.phonon.imports = $$QT_MODULE_IMPORT_BASE
QT.phonon.depends = core gui network
QT.phonon.DEFINES = QT_PHONON_LIB
diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri
index f78c269..082ad1a 100644
--- a/qt3support/modules/qt_qt3support.pri
+++ b/qt3support/modules/qt_qt3support.pri
@@ -9,6 +9,7 @@ QT.qt3support.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt3Su
QT.qt3support.private_includes = $$QT_MODULE_INCLUDE_BASE/Qt3Support/private
QT.qt3support.sources = $$QT_MODULE_BASE/src/qt3support
QT.qt3support.libs = $$QT_MODULE_LIB_BASE
+QT.qt3support.imports = $$QT_MODULE_IMPORT_BASE
QT.qt3support.depends = core gui
QT.qt3support.DEFINES = QT3_SUPPORT QT_QT3SUPPORT_LIB
diff --git a/qtkernel/bin/syncqt b/qtkernel/bin/syncqt
index 1228c3a..7446f3e 100755
--- a/qtkernel/bin/syncqt
+++ b/qtkernel/bin/syncqt
@@ -1009,6 +1009,7 @@ foreach my $lib (@modules_to_sync) {
print MODULE_PRI_FILE "QT_MODULE_BASE = $basedir\n";
print MODULE_PRI_FILE "QT_MODULE_BIN_BASE = $out_basedir/bin\n";
print MODULE_PRI_FILE "QT_MODULE_INCLUDE_BASE = $out_basedir/include\n";
+ print MODULE_PRI_FILE "QT_MODULE_IMPORT_BASE = $qtkerneldir/imports\n";
print MODULE_PRI_FILE "QT_MODULE_LIB_BASE = $qtkerneldir/lib\n";
print MODULE_PRI_FILE "include($modulepri)\n";
close MODULE_PRI_FILE;
diff --git a/qtkernel/mkspecs/features/qt_config.prf b/qtkernel/mkspecs/features/qt_config.prf
index 7e80ad3..0be4dee 100644
--- a/qtkernel/mkspecs/features/qt_config.prf
+++ b/qtkernel/mkspecs/features/qt_config.prf
@@ -21,6 +21,7 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS]
QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS]
QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS]
+ QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS]
include($$mod)
}
}
diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri
index 99f3fa6..dc2ca54 100644
--- a/qtkernel/src/modules/qt_core.pri
+++ b/qtkernel/src/modules/qt_core.pri
@@ -9,5 +9,6 @@ QT.core.includes = $$QT_MODULE_INCLUDE_BASE/QtCore
QT.core.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCore/private
QT.core.sources = $$QT_MODULE_BASE/src/corelib
QT.core.libs = $$QT_MODULE_LIB_BASE
+QT.core.imports = $$QT_MODULE_IMPORT_BASE
QT.core.depends =
QT.core.DEFINES = QT_CORE_LIB
diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri
index 74949b1..7d3b7f3 100644
--- a/qtkernel/src/modules/qt_dbus.pri
+++ b/qtkernel/src/modules/qt_dbus.pri
@@ -9,6 +9,7 @@ QT.dbus.includes = $$QT_MODULE_INCLUDE_BASE/QtDBus
QT.dbus.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDBus/private
QT.dbus.sources = $$QT_MODULE_BASE/src/dbus
QT.dbus.libs = $$QT_MODULE_LIB_BASE
+QT.dbus.imports = $$QT_MODULE_IMPORT_BASE
QT.dbus.depends = core xml
QT.dbus.CONFIG = dbusadaptors dbusinterfaces
QT.dbus.DEFINES = QT_DBUS_LIB
diff --git a/qtkernel/src/modules/qt_network.pri b/qtkernel/src/modules/qt_network.pri
index 37c941b..f9474bb 100644
--- a/qtkernel/src/modules/qt_network.pri
+++ b/qtkernel/src/modules/qt_network.pri
@@ -9,5 +9,6 @@ QT.network.includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork
QT.network.private_includes = $$QT_MODULE_INCLUDE_BASE/QtNetwork/private
QT.network.sources = $$QT_MODULE_BASE/src/network
QT.network.libs = $$QT_MODULE_LIB_BASE
+QT.network.imports = $$QT_MODULE_IMPORT_BASE
QT.network.depends = core
QT.network.DEFINES = QT_NETWORK_LIB
diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri
index 0bd0df7..a54c384 100644
--- a/qtkernel/src/modules/qt_opengl.pri
+++ b/qtkernel/src/modules/qt_opengl.pri
@@ -9,6 +9,7 @@ QT.opengl.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL
QT.opengl.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenGL/private
QT.opengl.sources = $$QT_MODULE_BASE/src/opengl
QT.opengl.libs = $$QT_MODULE_LIB_BASE
+QT.opengl.imports = $$QT_MODULE_IMPORT_BASE
QT.opengl.depends = core gui
QT.opengl.CONFIG = opengl
QT.opengl.DEFINES = QT_OPENGL_LIB
diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri
index 9a3ef8b..19a9a81 100644
--- a/qtkernel/src/modules/qt_openvg.pri
+++ b/qtkernel/src/modules/qt_openvg.pri
@@ -9,6 +9,7 @@ QT.openvg.includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG
QT.openvg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtOpenVG/private
QT.openvg.sources = $$QT_MODULE_BASE/src/openvg
QT.openvg.libs = $$QT_MODULE_LIB_BASE
+QT.openvg.imports = $$QT_MODULE_IMPORT_BASE
QT.openvg.depends = core gui
QT.openvg.CONFIG = openvg
QT.openvg.DEFINES = QT_OPENVG_LIB
diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri
index d9b856e..c3950b1 100644
--- a/qtkernel/src/modules/qt_sql.pri
+++ b/qtkernel/src/modules/qt_sql.pri
@@ -9,5 +9,6 @@ QT.sql.includes = $$QT_MODULE_INCLUDE_BASE/QtSql
QT.sql.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSql/private
QT.sql.sources = $$QT_MODULE_BASE/src/sql
QT.sql.libs = $$QT_MODULE_LIB_BASE
+QT.sql.imports = $$QT_MODULE_IMPORT_BASE
QT.sql.depends = core
QT.sql.DEFINES = QT_SQL_LIB
diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri
index 7e9ca09..a4f5dd2 100644
--- a/qtkernel/src/modules/qt_testlib.pri
+++ b/qtkernel/src/modules/qt_testlib.pri
@@ -9,6 +9,7 @@ QT.testlib.includes = $$QT_MODULE_INCLUDE_BASE/QtTest
QT.testlib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtTest/private
QT.testlib.sources = $$QT_MODULE_BASE/src/testlib
QT.testlib.libs = $$QT_MODULE_LIB_BASE
+QT.testlib.imports = $$QT_MODULE_IMPORT_BASE
QT.testlib.depends = core
QT.testlib.CONFIG = console
QT.testlib.DEFINES = QT_TESTLIB_LIB
diff --git a/qtkernel/src/modules/qt_uilib.pri b/qtkernel/src/modules/qt_uilib.pri
index 0e143de..d1bd19a 100644
--- a/qtkernel/src/modules/qt_uilib.pri
+++ b/qtkernel/src/modules/qt_uilib.pri
@@ -9,4 +9,5 @@ QT.uilib.includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner
QT.uilib.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
QT.uilib.sources = $$QT_MODULE_BASE/tools/uilib
QT.uilib.libs = $$QT_MODULE_LIB_BASE
+QT.uilib.imports = $$QT_MODULE_IMPORT_BASE
QT.uilib.depends = xml
diff --git a/qtkernel/src/modules/qt_uitools.pri b/qtkernel/src/modules/qt_uitools.pri
index 1f4070c..5b71e27 100644
--- a/qtkernel/src/modules/qt_uitools.pri
+++ b/qtkernel/src/modules/qt_uitools.pri
@@ -9,6 +9,7 @@ QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools
QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
QT.uitools.sources = $$QT_MODULE_BASE/src/uitools
QT.uitools.libs = $$QT_MODULE_LIB_BASE
+QT.uitools.imports = $$QT_MODULE_IMPORT_BASE
QT.uitools.depends = xml
QT.uitools.DEFINES = QT_UITOOLS_LIB
diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri
index c967cd7..95d9467 100644
--- a/qtkernel/src/modules/qt_xml.pri
+++ b/qtkernel/src/modules/qt_xml.pri
@@ -9,5 +9,6 @@ QT.xml.includes = $$QT_MODULE_INCLUDE_BASE/QtXml
QT.xml.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXml/private
QT.xml.sources = $$QT_MODULE_BASE/src/xml
QT.xml.libs = $$QT_MODULE_LIB_BASE
+QT.xml.imports = $$QT_MODULE_IMPORT_BASE
QT.xml.depends = core
QT.xml.DEFINES = QT_XML_LIB
diff --git a/qtmultimedia/modules/qt_multimedia.pri b/qtmultimedia/modules/qt_multimedia.pri
index b060bf2..a81df0e 100644
--- a/qtmultimedia/modules/qt_multimedia.pri
+++ b/qtmultimedia/modules/qt_multimedia.pri
@@ -9,5 +9,6 @@ QT.multimedia.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtMul
QT.multimedia.private_includes = $$QT_MODULE_INCLUDE_BASE/QtMultimedia/private
QT.multimedia.sources = $$QT_MODULE_BASE/src/multimedia
QT.multimedia.libs = $$QT_MODULE_LIB_BASE
+QT.multimedia.imports = $$QT_MODULE_IMPORT_BASE
QT.multimedia.depends = core gui
QT.multimedia.DEFINES = QT_MULTIMEDIA_LIB
diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
index a24745b..01c525d 100644
--- a/qtquick/modules/qt_declarative.pri
+++ b/qtquick/modules/qt_declarative.pri
@@ -9,6 +9,7 @@ QT.declarative.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDe
QT.declarative.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDeclarative/private
QT.declarative.sources = $$QT_MODULE_BASE/src/declarative
QT.declarative.libs = $$QT_MODULE_LIB_BASE
+QT.declarative.imports = $$QT_MODULE_IMPORT_BASE
QT.declarative.depends = gui script network
QT.declarative.DEFINES = QT_DECLARATIVE_LIB
diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri
index 2063693..ff4494f 100644
--- a/qtscript/modules/qt_script.pri
+++ b/qtscript/modules/qt_script.pri
@@ -9,6 +9,7 @@ QT.script.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtScript
QT.script.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScript/private
QT.script.sources = $$QT_MODULE_BASE/src/script
QT.script.libs = $$QT_MODULE_LIB_BASE
+QT.script.imports = $$QT_MODULE_IMPORT_BASE
QT.script.depends = core
QT.script.DEFINES = QT_SCRIPT_LIB
diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri
index 6fff333..70acaf4 100644
--- a/qtscript/modules/qt_scripttools.pri
+++ b/qtscript/modules/qt_scripttools.pri
@@ -9,6 +9,7 @@ QT.scripttools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSc
QT.scripttools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtScriptTools/private
QT.scripttools.sources = $$QT_MODULE_BASE/src/scripttools
QT.scripttools.libs = $$QT_MODULE_LIB_BASE
+QT.scripttools.imports = $$QT_MODULE_IMPORT_BASE
QT.scripttools.depends = script gui network
QT.scripttools.DEFINES = QT_SCRIPTTOOLS_LIB
diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri
index 88edb85..fda42a4 100644
--- a/qtsvg/modules/qt_svg.pri
+++ b/qtsvg/modules/qt_svg.pri
@@ -9,5 +9,6 @@ QT.svg.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtSvg
QT.svg.private_includes = $$QT_MODULE_INCLUDE_BASE/QtSvg/private
QT.svg.sources = $$QT_MODULE_BASE/src/svg
QT.svg.libs = $$QT_MODULE_LIB_BASE
+QT.svg.imports = $$QT_MODULE_IMPORT_BASE
QT.svg.depends = core gui
QT.svg.DEFINES = QT_SVG_LIB
diff --git a/qttools/modules/qt_clucene.pri b/qttools/modules/qt_clucene.pri
index 77beaa6..7f7c56b 100644
--- a/qttools/modules/qt_clucene.pri
+++ b/qttools/modules/qt_clucene.pri
@@ -9,4 +9,5 @@ QT.clucene.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtCLucen
QT.clucene.private_includes = $$QT_MODULE_INCLUDE_BASE/QtCLucene/private
QT.clucene.sources = $$QT_MODULE_BASE/src/assistant/lib/fulltextsearch
QT.clucene.libs = $$QT_MODULE_LIB_BASE
+QT.clucene.imports = $$QT_MODULE_IMPORT_BASE
QT.clucene.depends = core
diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri
index a617834..913866f 100644
--- a/qttools/modules/qt_designer.pri
+++ b/qttools/modules/qt_designer.pri
@@ -9,5 +9,6 @@ QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesig
QT.designer.private_includes = $$QT_MODULE_INCLUDE_BASE/QtDesigner/private
QT.designer.sources = $$QT_MODULE_BASE/src/designer/src/lib
QT.designer.libs = $$QT_MODULE_LIB_BASE
+QT.designer.imports = $$QT_MODULE_IMPORT_BASE
QT.designer.depends = xml
QT.designer.DEFINES = QT_DESIGNER_LIB
diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri
index 07e815d..bc5481f 100644
--- a/qttools/modules/qt_help.pri
+++ b/qttools/modules/qt_help.pri
@@ -9,5 +9,6 @@ QT.help.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtHelp
QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private
QT.help.sources = $$QT_MODULE_BASE/src/assistant/lib
QT.help.libs = $$QT_MODULE_LIB_BASE
+QT.help.imports = $$QT_MODULE_IMPORT_BASE
QT.help.depends = network xml sql
QT.help.DEFINES = QT_HELP_LIB
diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri
index 329b784..3f37d50 100644
--- a/qtxmlpatterns/modules/qt_xmlpatterns.pri
+++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri
@@ -9,6 +9,7 @@ QT.xmlpatterns.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtXm
QT.xmlpatterns.private_includes = $$QT_MODULE_INCLUDE_BASE/QtXmlPatterns/private
QT.xmlpatterns.sources = $$QT_MODULE_BASE/src/xmlpatterns
QT.xmlpatterns.libs = $$QT_MODULE_LIB_BASE
+QT.xmlpatterns.imports = $$QT_MODULE_IMPORT_BASE
QT.xmlpatterns.depends = core network
QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB
--
1.7.3.2.343.g7d43d
|
