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
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
|
From 74b7fb67b70903eb483288c44314fbc8aaeb6aa0 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Tue, 11 Jan 2011 08:40:22 +0100
Subject: [PATCH] Make tools compile.
---
qttools/modules/qt_designer.pri | 10 ++++++++++
qttools/modules/qt_uitools.pri | 10 ++++++++++
.../src/assistant/tools/assistant/assistant.pro | 6 +++---
.../qcollectiongenerator/qcollectiongenerator.pro | 3 ++-
.../tools/qhelpconverter/qhelpconverter.pro | 2 +-
.../tools/qhelpgenerator/qhelpgenerator.pro | 2 +-
qttools/src/designer/src/components/lib/lib.pro | 11 ++++++-----
qttools/src/designer/src/designer/designer.pro | 3 ++-
qttools/src/designer/src/lib/lib.pro | 9 ++++++---
qttools/src/designer/src/lib/shared/shared.pri | 2 +-
qttools/src/linguist/linguist/linguist.pro | 5 ++++-
qttools/src/linguist/lrelease/lrelease.pro | 6 ++++--
qttools/src/linguist/lupdate/lupdate.pro | 6 ++++--
qttools/src/qtconfig/qtconfig.pro | 2 ++
qttools/src/qttracereplay/qttracereplay.pro | 4 +++-
qttools/src/src.pro | 3 +--
qttools/sync.profile | 13 +++++++++++++
17 files changed, 73 insertions(+), 24 deletions(-)
create mode 100644 qttools/modules/qt_designer.pri
create mode 100644 qttools/modules/qt_uitools.pri
diff --git a/qttools/modules/qt_designer.pri b/qttools/modules/qt_designer.pri
new file mode 100644
index 0000000..8d7c513
--- /dev/null
+++ b/qttools/modules/qt_designer.pri
@@ -0,0 +1,10 @@
+QT_DESIGNER_VERSION = $$QT_VERSION
+QT_DESIGNER_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_DESIGNER_MINOR_VERSION = $$QT_MINOR_VERSION
+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.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_uitools.pri b/qttools/modules/qt_uitools.pri
new file mode 100644
index 0000000..516afef
--- /dev/null
+++ b/qttools/modules/qt_uitools.pri
@@ -0,0 +1,10 @@
+QT_UITOOLS_VERSION = $$QT_VERSION
+QT_UITOOLS_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_UITOOLS_MINOR_VERSION = $$QT_MINOR_VERSION
+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.sources = $$QT_MODULE_BASE/src/designer/src/uitools
+QT.uitools.libs = $$QT_MODULE_LIB_BASE
+QT.uitools.depends = xml
diff --git a/qttools/src/assistant/tools/assistant/assistant.pro b/qttools/src/assistant/tools/assistant/assistant.pro
index 7f0fdd1..dd79c10 100644
--- a/qttools/src/assistant/tools/assistant/assistant.pro
+++ b/qttools/src/assistant/tools/assistant/assistant.pro
@@ -1,3 +1,4 @@
+DEFINES += QT_NO_WEBKIT
include(../../../shared/fontpanel/fontpanel.pri)
TEMPLATE = app
LANGUAGE = C++
@@ -6,14 +7,13 @@ contains(QT_CONFIG, webkit):QT += webkit
CONFIG += qt \
warn_on \
help
-QT += network
+QT += network help
PROJECTNAME = Assistant
DESTDIR = ../../../../bin
target.path = $$[QT_INSTALL_BINS]
INSTALLS += target
DEPENDPATH += ../shared
-DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += $$QT.help.includes
# ## Work around a qmake issue when statically linking to
# ## not-yet-installed plugins
diff --git a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
index 98e6a31..66e920f 100644
--- a/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+++ b/qttools/src/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
@@ -1,5 +1,6 @@
QT += xml \
- network
+ network \
+ help
TEMPLATE = app
DESTDIR = ../../../../bin
TARGET = qcollectiongenerator
diff --git a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro
index 341faf3..ce3083e 100644
--- a/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro
+++ b/qttools/src/assistant/tools/qhelpconverter/qhelpconverter.pro
@@ -1,4 +1,4 @@
-QT += xml
+QT += xml help
TEMPLATE = app
TARGET = qhelpconverter
DESTDIR = ../../../../bin
diff --git a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
index 68efcf5..82bec1d 100644
--- a/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+++ b/qttools/src/assistant/tools/qhelpgenerator/qhelpgenerator.pro
@@ -3,7 +3,7 @@ TARGET = qhelpgenerator
DESTDIR = ../../../../bin
CONFIG += qt warn_on help console
CONFIG -= app_bundle
-QT += network
+QT += network help
target.path=$$[QT_INSTALL_BINS]
INSTALLS += target
diff --git a/qttools/src/designer/src/components/lib/lib.pro b/qttools/src/designer/src/components/lib/lib.pro
index 50a8b00..165315e 100644
--- a/qttools/src/designer/src/components/lib/lib.pro
+++ b/qttools/src/designer/src/components/lib/lib.pro
@@ -1,12 +1,13 @@
+load(qt_module)
+
TEMPLATE = lib
TARGET = QtDesignerComponents
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += qt depend_prl no_objective_c designer
win32|mac: CONFIG += debug_and_release
-QTDIR_build {
- DESTDIR = $$QT_BUILD_TREE/lib
- !wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
-}
+DESTDIR = $$QT_BUILD_TREE/lib
+!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
+QT += designer
# QtDesignerComponents uses
DEFINES += QT_STATICPLUGIN
@@ -17,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) {
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
}
-include(../../../../../src/qt_targets.pri)
+include($$QT_SOURCE_TREE/src/qt_targets.pri)
QMAKE_TARGET_PRODUCT = Designer
QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
diff --git a/qttools/src/designer/src/designer/designer.pro b/qttools/src/designer/src/designer/designer.pro
index 8564e96..42cd345 100644
--- a/qttools/src/designer/src/designer/designer.pro
+++ b/qttools/src/designer/src/designer/designer.pro
@@ -1,6 +1,7 @@
+load(qt_module)
DESTDIR = ../../../../bin
-QT += xml network
+QT += xml network designer
contains(QT_CONFIG, script): QT += script
build_all:!build_pass {
CONFIG -= build_all
diff --git a/qttools/src/designer/src/lib/lib.pro b/qttools/src/designer/src/lib/lib.pro
index 3ba6f52..4e0e2b2 100644
--- a/qttools/src/designer/src/lib/lib.pro
+++ b/qttools/src/designer/src/lib/lib.pro
@@ -1,11 +1,14 @@
+load(qt_module)
+
TEMPLATE=lib
TARGET=QtDesigner
QT += xml
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += qt
win32|mac: CONFIG += debug_and_release
-DESTDIR = ../../../../lib
-!wince*:DLLDESTDIR = ../../../../bin
+DESTDIR = $$QT_BUILD_TREE/lib
+!wince*:DLLDESTDIR = $$QT_BUILD_TREE/bin
+INCLUDEPATH += $$QT.designer.includes
isEmpty(QT_MAJOR_VERSION) {
VERSION=4.3.0
@@ -15,7 +18,7 @@ isEmpty(QT_MAJOR_VERSION) {
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES += QtXml
-include(../../../../src/qt_targets.pri)
+include($$QT_SOURCE_TREE/src/qt_targets.pri)
QMAKE_TARGET_PRODUCT = Designer
QMAKE_TARGET_DESCRIPTION = Graphical user interface designer.
diff --git a/qttools/src/designer/src/lib/shared/shared.pri b/qttools/src/designer/src/lib/shared/shared.pri
index 9d50911..0d14517 100644
--- a/qttools/src/designer/src/lib/shared/shared.pri
+++ b/qttools/src/designer/src/lib/shared/shared.pri
@@ -4,7 +4,7 @@ contains(QT_CONFIG, script): QT += script
include(../../../../shared/qtpropertybrowser/qtpropertybrowserutils.pri)
include(../../../../shared/deviceskin/deviceskin.pri)
-include(../../../../../src/tools/rcc/rcc.pri)
+include($$QT_SOURCE_TREE/src/tools/rcc/rcc.pri)
include(../../../../shared/findwidget/findwidget.pri)
include(../../../../shared/qtgradienteditor/qtgradienteditor.pri)
diff --git a/qttools/src/linguist/linguist/linguist.pro b/qttools/src/linguist/linguist/linguist.pro
index ce8d585..ce78d13 100644
--- a/qttools/src/linguist/linguist/linguist.pro
+++ b/qttools/src/linguist/linguist/linguist.pro
@@ -1,8 +1,10 @@
+load(qt_modules)
+
TEMPLATE = app
LANGUAGE = C++
DESTDIR = ../../../bin
-QT += xml
+QT += xml uitools designer
CONFIG += qt \
warn_on \
@@ -17,6 +19,7 @@ build_all:!build_pass {
include(../shared/formats.pri)
DEFINES += QFORMINTERNAL_NAMESPACE
+
INCLUDEPATH += ../../designer/src/uitools
INCLUDEPATH += ../../designer/src/lib/uilib
diff --git a/qttools/src/linguist/lrelease/lrelease.pro b/qttools/src/linguist/lrelease/lrelease.pro
index 89694be..8489431 100644
--- a/qttools/src/linguist/lrelease/lrelease.pro
+++ b/qttools/src/linguist/lrelease/lrelease.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
TEMPLATE = app
TARGET = lrelease
DESTDIR = ../../../bin
@@ -12,10 +14,10 @@ SOURCES += \
win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_win.cpp
macx:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qsettings_mac.cpp
-include(../../../src/tools/bootstrap/bootstrap.pri)
+include($$QT_SOURCE_TREE/src/tools/bootstrap/bootstrap.pri)
include(../shared/formats.pri)
include(../shared/proparser.pri)
-include(../../shared/symbian/epocroot.pri)
+include($$QT_SOURCE_TREE/tools/shared/symbian/epocroot.pri)
win32:LIBS += -ladvapi32 # for qsettings_win.cpp
diff --git a/qttools/src/linguist/lupdate/lupdate.pro b/qttools/src/linguist/lupdate/lupdate.pro
index 3ed909a..5f1996e 100644
--- a/qttools/src/linguist/lupdate/lupdate.pro
+++ b/qttools/src/linguist/lupdate/lupdate.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
TEMPLATE = app
TARGET = lupdate
DESTDIR = ../../../bin
@@ -15,8 +17,8 @@ build_all:!build_pass {
include(../shared/formats.pri)
include(../shared/proparser.pri)
-include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
-INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml $$QT_BUILD_TREE/include/QtDeclarative
+include($$QT.declarative.sources/qml/parser/parser.pri)
+INCLUDEPATH += $$QT.declarative.sources/qml $$QT.declarative.includes
SOURCES += \
main.cpp \
diff --git a/qttools/src/qtconfig/qtconfig.pro b/qttools/src/qtconfig/qtconfig.pro
index cb06e5a..bd758d9 100644
--- a/qttools/src/qtconfig/qtconfig.pro
+++ b/qttools/src/qtconfig/qtconfig.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
TEMPLATE = app
CONFIG += qt warn_on x11
build_all:!build_pass {
diff --git a/qttools/src/qttracereplay/qttracereplay.pro b/qttools/src/qttracereplay/qttracereplay.pro
index cc5b98d..691a66b 100644
--- a/qttools/src/qttracereplay/qttracereplay.pro
+++ b/qttools/src/qttracereplay/qttracereplay.pro
@@ -1,9 +1,11 @@
+load(qt_module)
+
TEMPLATE = app
DESTDIR = ../../bin
DEPENDPATH += .
-INCLUDEPATH += . ../../src/3rdparty/harfbuzz/src
+INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
TARGET = qttracereplay
# Input
diff --git a/qttools/src/src.pro b/qttools/src/src.pro
index c6174e4..02e6a23 100644
--- a/qttools/src/src.pro
+++ b/qttools/src/src.pro
@@ -11,7 +11,6 @@ TEMPLATE = subdirs
} else {
SUBDIRS = assistant \
pixeltool \
- porting \
qtestlib \
qttracereplay
contains(QT_EDITION, Console) {
@@ -20,7 +19,7 @@ TEMPLATE = subdirs
SUBDIRS += designer
}
}
- unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
+# unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
win32:!wince*:SUBDIRS += activeqt
}
}
diff --git a/qttools/sync.profile b/qttools/sync.profile
index c6aaf0e..443b891 100644
--- a/qttools/sync.profile
+++ b/qttools/sync.profile
@@ -1,12 +1,25 @@
%modules = ( # path to module name map
"QtHelp" => "$basedir/src/assistant/lib",
+ "QtDesigner" => "$basedir/src/designer/src/lib",
+ "QtUiTools" => "$basedir/src/designer/src/uitools",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);
%classnames = (
);
%mastercontent = (
+ "sql" => "#include <QtSql/QtSql>\n",
+ "xml" => "#include <QtXml/QtXml>\n",
+ "network" => "#include <QtNetwork/QtNetwork>\n",
+ "script" => "#include <QtScript/QtScript>\n",
+ "qt3support" => "#include <Qt3Support/Qt3Support>\n",
+ "declarative" => "#include <QtDeclarative/QtDeclarative>\n",
+ "help" => "#include <QtHelp/QtHelp>\n",
+ "designer" => "#include <QtDesigner/QtDesigner>\n",
+ "uitools" => "#include <QtUiTools/QtUiTools>\n",
);
%modulepris = (
"QtHelp" => "$basedir/modules/qt_help.pri",
+ "QtDesigner" => "$basedir/modules/qt_designer.pri",
+ "QtUiTools" => "$basedir/modules/qt_uitools.pri",
);
--
1.7.3.2.343.g7d43d
|
