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
|
From d8b4cb6f259f84062b6a03ac87c6bfbfdf6b60a1 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Mon, 27 Dec 2010 14:49:29 +0100
Subject: [PATCH] Move QtSvg into a separate repository
---
qtbase/src/modules/qt_svg.pri | 11 -----------
qtbase/src/plugins/imageformats/imageformats.pro | 1 -
qtbase/src/plugins/plugins.pro | 2 +-
qtbase/src/src.pro | 9 +--------
qtbase/sync.profile | 3 ---
qtsvg/modules/qt_svg.pri | 11 +++++++++++
.../iconengines/svgiconengine/svgiconengine.pro | 6 ++++--
qtsvg/src/plugins/imageformats/svg/svg.pro | 6 ++++--
qtsvg/src/svg/svg.pro | 9 +++++----
qtsvg/sync.profile | 14 ++++++++++++++
10 files changed, 40 insertions(+), 32 deletions(-)
delete mode 100644 qtbase/src/modules/qt_svg.pri
create mode 100644 qtsvg/modules/qt_svg.pri
create mode 100644 qtsvg/sync.profile
diff --git a/qtbase/src/modules/qt_svg.pri b/qtbase/src/modules/qt_svg.pri
deleted file mode 100644
index 90df93f..0000000
--- a/qtbase/src/modules/qt_svg.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-QT_SVG_VERSION = $$QT_VERSION
-QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION
-QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION
-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/qtbase/src/plugins/imageformats/imageformats.pro b/qtbase/src/plugins/imageformats/imageformats.pro
index 5fff2de..66dea09 100644
--- a/qtbase/src/plugins/imageformats/imageformats.pro
+++ b/qtbase/src/plugins/imageformats/imageformats.pro
@@ -3,6 +3,5 @@ TEMPLATE = subdirs
!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
!contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
!contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng
-contains(QT_CONFIG, svg):SUBDIRS += svg
!contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff
!contains(QT_CONFIG, no-ico):SUBDIRS += ico
diff --git a/qtbase/src/plugins/plugins.pro b/qtbase/src/plugins/plugins.pro
index d0d7188..c1aff35 100644
--- a/qtbase/src/plugins/plugins.pro
+++ b/qtbase/src/plugins/plugins.pro
@@ -6,7 +6,7 @@ unix:!symbian {
} else {
SUBDIRS *= codecs
}
-!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
+!contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats
!embedded:!qpa:SUBDIRS *= graphicssystems
embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
!win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
diff --git a/qtbase/src/src.pro b/qtbase/src/src.pro
index 5c33e92..7c51c25 100644
--- a/qtbase/src/src.pro
+++ b/qtbase/src/src.pro
@@ -13,7 +13,6 @@ nacl: SRC_SUBDIRS -= src_network src_testlib
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
-contains(QT_CONFIG, svg): SRC_SUBDIRS += src_svg
SRC_SUBDIRS += src_plugins
# s60installs need to be at the end, because qtbase.pro does an ordered build,
@@ -38,8 +37,6 @@ src_sql.subdir = $$QT_SOURCE_TREE/src/sql
src_sql.target = sub-sql
src_network.subdir = $$QT_SOURCE_TREE/src/network
src_network.target = sub-network
-src_svg.subdir = $$QT_SOURCE_TREE/src/svg
-src_svg.target = sub-svg
src_opengl.subdir = $$QT_SOURCE_TREE/src/opengl
src_opengl.target = sub-opengl
src_openvg.subdir = $$QT_SOURCE_TREE/src/openvg
@@ -56,7 +53,6 @@ src_testlib.target = sub-testlib
embedded: src_gui.depends += src_network
src_xml.depends = src_corelib
src_dbus.depends = src_corelib src_xml
- src_svg.depends = src_corelib src_gui
src_network.depends = src_corelib
src_opengl.depends = src_gui
src_openvg.depends = src_gui
@@ -64,7 +60,7 @@ src_testlib.target = sub-testlib
src_testlib.depends = src_corelib
src_tools_idc.depends = src_corelib # target defined in tools.pro
src_tools_uic3.depends = src_qt3support src_xml # target defined in tools.pro
- src_plugins.depends = src_gui src_sql src_svg src_xml
+ src_plugins.depends = src_gui src_sql src_xml
src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
src_s60installs.depends -= src_s60installs
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
@@ -72,9 +68,6 @@ src_testlib.target = sub-testlib
src_declarative.depends += src_opengl
src_webkit.depends += src_opengl
}
- contains(QT_CONFIG, svg) {
- src_declarative.depends += src_svg
- }
}
diff --git a/qtbase/sync.profile b/qtbase/sync.profile
index c8ef4fc..7984329 100644
--- a/qtbase/sync.profile
+++ b/qtbase/sync.profile
@@ -6,7 +6,6 @@
"QtXml" => "$basedir/src/xml",
"QtSql" => "$basedir/src/sql",
"QtNetwork" => "$basedir/src/network",
- "QtSvg" => "$basedir/src/svg",
"QtTest" => "$basedir/src/testlib",
"QtDBus" => "$basedir/src/dbus",
);
@@ -32,7 +31,6 @@
"core" => "#include <QtCore/QtCore>\n",
"gui" => "#include <QtGui/QtGui>\n",
"network" => "#include <QtNetwork/QtNetwork>\n",
- "svg" => "#include <QtSvg/QtSvg>\n",
"opengl" => "#include <QtOpenGL/QtOpenGL>\n",
"openvg" => "#include <QtOpenVG/QtOpenVG>\n",
"xml" => "#include <QtXml/QtXml>\n",
@@ -45,7 +43,6 @@
"QtOpenGL" => "$basedir/src/modules/qt_opengl.pri",
"QtOpenVG" => "$basedir/src/modules/qt_openvg.pri",
"QtSql" => "$basedir/src/modules/qt_sql.pri",
- "QtSvg" => "$basedir/src/modules/qt_svg.pri",
"QtTest" => "$basedir/src/modules/qt_testlib.pri",
"QtXml" => "$basedir/src/modules/qt_xml.pri",
);
diff --git a/qtsvg/modules/qt_svg.pri b/qtsvg/modules/qt_svg.pri
new file mode 100644
index 0000000..5fa3212
--- /dev/null
+++ b/qtsvg/modules/qt_svg.pri
@@ -0,0 +1,11 @@
+QT_SVG_VERSION = $$QT_VERSION
+QT_SVG_MAJOR_VERSION = $$QT_MAJOR_VERSION
+QT_SVG_MINOR_VERSION = $$QT_MINOR_VERSION
+QT_SVG_PATCH_VERSION = $$QT_PATCH_VERSION
+
+QT.svg.name = QtSvg
+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.depends = core gui
diff --git a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro
index 5c5a31e..642fb0f 100644
--- a/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ b/qtsvg/src/plugins/iconengines/svgiconengine/svgiconengine.pro
@@ -1,12 +1,14 @@
+load(qt_module)
+
TARGET = qsvgicon
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
HEADERS += qsvgiconengine.h
SOURCES += main.cpp \
qsvgiconengine.cpp
QT += xml svg
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/iconengines
+DESTDIR = $$QT_BUILD_TREE/plugins/iconengines
target.path += $$[QT_INSTALL_PLUGINS]/iconengines
INSTALLS += target
diff --git a/qtsvg/src/plugins/imageformats/svg/svg.pro b/qtsvg/src/plugins/imageformats/svg/svg.pro
index bcf4c21..c3412b9 100644
--- a/qtsvg/src/plugins/imageformats/svg/svg.pro
+++ b/qtsvg/src/plugins/imageformats/svg/svg.pro
@@ -1,12 +1,14 @@
+load(qt_module)
+
TARGET = qsvg
-include(../../qpluginbase.pri)
+include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri)
HEADERS += qsvgiohandler.h
SOURCES += main.cpp \
qsvgiohandler.cpp
QT += xml svg
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
+DESTDIR = $$QT_BUILD_TREE/plugins/imageformats
target.path += $$[QT_INSTALL_PLUGINS]/imageformats
INSTALLS += target
diff --git a/qtsvg/src/svg/svg.pro b/qtsvg/src/svg/svg.pro
index 79f284a..3572d59 100644
--- a/qtsvg/src/svg/svg.pro
+++ b/qtsvg/src/svg/svg.pro
@@ -1,3 +1,5 @@
+load(qt_module)
+
TARGET = QtSvg
QPRO_PWD = $$PWD
QT = core gui
@@ -8,8 +10,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
-include(../qbase.pri)
-
+include($$QT_SOURCE_TREE/src/qbase.pri)
HEADERS += \
qsvggraphics_p.h \
@@ -38,8 +39,8 @@ SOURCES += \
qgraphicssvgitem.cpp \
qsvggenerator.cpp
-INCLUDEPATH += ../3rdparty/harfbuzz/src
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
symbian:TARGET.UID3=0x2001B2E2
-include(../3rdparty/zlib_dependency.pri)
+include($$QT_SOURCE_TREE/src/3rdparty/zlib_dependency.pri)
diff --git a/qtsvg/sync.profile b/qtsvg/sync.profile
new file mode 100644
index 0000000..275e96c
--- /dev/null
+++ b/qtsvg/sync.profile
@@ -0,0 +1,14 @@
+%modules = ( # path to module name map
+ "QtSvg" => "$basedir/src/svg",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+);
+%classnames = (
+);
+%mastercontent = (
+ "core" => "#include <QtCore/QtCore>\n",
+ "gui" => "#include <QtGui/QtGui>\n",
+);
+%modulepris = (
+ "QtSvg" => "$basedir/modules/qt_svg.pri",
+);
--
1.7.3.4
|
