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
|
From 2a1a3e71597b04f1d45716638ce31f0f560ce1ea Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 23 Dec 2010 09:38:00 +0100
Subject: [PATCH] Add the private_includes path to the modules .pri file
---
qt3support/modules/qt_qt3support.pri | 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 +
qtquick/modules/qt_declarative.pri | 1 +
qtscript/modules/qt_script.pri | 1 +
qtscript/modules/qt_scripttools.pri | 1 +
qttools/modules/qt_designer.pri | 1 +
qttools/modules/qt_help.pri | 1 +
qttools/modules/qt_uitools.pri | 1 +
qtxmlpatterns/modules/qt_xmlpatterns.pri | 1 +
18 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/qt3support/modules/qt_qt3support.pri b/qt3support/modules/qt_qt3support.pri
index 86d6395..76ad617 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.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.depends = core gui
diff --git a/qtkernel/src/modules/qt_core.pri b/qtkernel/src/modules/qt_core.pri
index 246fed7..92e1d21 100644
--- a/qtkernel/src/modules/qt_core.pri
+++ b/qtkernel/src/modules/qt_core.pri
@@ -5,6 +5,7 @@ QT_CORE_PATCH_VERSION = $$QT_PATCH_VERSION
QT.core.name = QtCore
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.depends =
diff --git a/qtkernel/src/modules/qt_dbus.pri b/qtkernel/src/modules/qt_dbus.pri
index e930949..0a0618e 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.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.depends = core xml
diff --git a/qtkernel/src/modules/qt_gui.pri b/qtkernel/src/modules/qt_gui.pri
index 0f5da2f..e88be8f 100644
--- a/qtkernel/src/modules/qt_gui.pri
+++ b/qtkernel/src/modules/qt_gui.pri
@@ -5,6 +5,7 @@ QT_GUI_PATCH_VERSION = $$QT_PATCH_VERSION
QT.gui.name = QtGui
QT.gui.includes = $$QT_MODULE_INCLUDE_BASE/QtGui
+QT.gui.private_includes = $$QT_MODULE_INCLUDE_BASE/QtGui/private
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 4a9ae46..d0fe251 100644
--- a/qtkernel/src/modules/qt_network.pri
+++ b/qtkernel/src/modules/qt_network.pri
@@ -5,6 +5,7 @@ QT_NETWORK_PATCH_VERSION = $$QT_PATCH_VERSION
QT.network.name = QtNetwork
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.depends = core
diff --git a/qtkernel/src/modules/qt_opengl.pri b/qtkernel/src/modules/qt_opengl.pri
index 71cfa2f..a552407 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.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.depends = core gui
diff --git a/qtkernel/src/modules/qt_openvg.pri b/qtkernel/src/modules/qt_openvg.pri
index bd50abb..67fb6ae 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.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.depends = core gui
diff --git a/qtkernel/src/modules/qt_sql.pri b/qtkernel/src/modules/qt_sql.pri
index 4ec18f0..3ca3df9 100644
--- a/qtkernel/src/modules/qt_sql.pri
+++ b/qtkernel/src/modules/qt_sql.pri
@@ -5,6 +5,7 @@ QT_SQL_PATCH_VERSION = $$QT_PATCH_VERSION
QT.sql.name = QtSql
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.depends = core
diff --git a/qtkernel/src/modules/qt_svg.pri b/qtkernel/src/modules/qt_svg.pri
index 1be80f6..90df93f 100644
--- a/qtkernel/src/modules/qt_svg.pri
+++ b/qtkernel/src/modules/qt_svg.pri
@@ -5,6 +5,7 @@ QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION
QT.svg.name = QtSvg
QT.svg.includes = $$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.depends = core gui
diff --git a/qtkernel/src/modules/qt_testlib.pri b/qtkernel/src/modules/qt_testlib.pri
index ffca9f0..44ebf3c 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.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.depends = core
diff --git a/qtkernel/src/modules/qt_xml.pri b/qtkernel/src/modules/qt_xml.pri
index 4932ae5..8c47bfc 100644
--- a/qtkernel/src/modules/qt_xml.pri
+++ b/qtkernel/src/modules/qt_xml.pri
@@ -5,6 +5,7 @@ QT_XML_PATCH_VERSION = $$QT_PATCH_VERSION
QT.xml.name = QtXml
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.depends = core
diff --git a/qtquick/modules/qt_declarative.pri b/qtquick/modules/qt_declarative.pri
index 1ddd14a..c27a87e 100644
--- a/qtquick/modules/qt_declarative.pri
+++ b/qtquick/modules/qt_declarative.pri
@@ -5,6 +5,7 @@ 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.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.depends = gui script network
diff --git a/qtscript/modules/qt_script.pri b/qtscript/modules/qt_script.pri
index f44224d..febdef3 100644
--- a/qtscript/modules/qt_script.pri
+++ b/qtscript/modules/qt_script.pri
@@ -5,6 +5,7 @@ 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.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.depends = core
diff --git a/qtscript/modules/qt_scripttools.pri b/qtscript/modules/qt_scripttools.pri
index 124a930..a37cecd 100644
--- a/qtscript/modules/qt_scripttools.pri
+++ b/qtscript/modules/qt_scripttools.pri
@@ -5,6 +5,7 @@ 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.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.depends = script gui network
diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri
index 8d7c513..7f0a5d3 100644
--- a/qttools/modules/qt_designer.pri
+++ b/qttools/modules/qt_designer.pri
@@ -5,6 +5,7 @@ QT_DESIGNER_PATCH_VERSION = $$QT_PATCH_VERSION
QT.designer.name = QtDesigner
QT.designer.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtDesigner
+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.depends = xml
diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri
index 8812d5e..f36858f 100644
--- a/qttools/modules/qt_help.pri
+++ b/qttools/modules/qt_help.pri
@@ -5,6 +5,7 @@ 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.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.depends = network xml sql
diff --git a/qttools/modules/qt_uitools.pri b/qttools/modules/qt_uitools.pri
index 516afef..4de5d05 100644
--- a/qttools/modules/qt_uitools.pri
+++ b/qttools/modules/qt_uitools.pri
@@ -5,6 +5,7 @@ QT_UITOOLS_PATCH_VERSION = $$QT_PATCH_VERSION
QT.uitools.name = QtUiTools
QT.uitools.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtUiTools
+QT.uitools.private_includes = $$QT_MODULE_INCLUDE_BASE/QtUiTools/private
QT.uitools.sources = $$QT_MODULE_BASE/src/designer/src/uitools
QT.uitools.libs = $$QT_MODULE_LIB_BASE
QT.uitools.depends = xml
diff --git a/qtxmlpatterns/modules/qt_xmlpatterns.pri b/qtxmlpatterns/modules/qt_xmlpatterns.pri
index a11c06a..d67a720 100644
--- a/qtxmlpatterns/modules/qt_xmlpatterns.pri
+++ b/qtxmlpatterns/modules/qt_xmlpatterns.pri
@@ -5,6 +5,7 @@ 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.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.depends = core network
--
1.7.0.4
|
