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
|
In order to build the QtMof add-on inside Qt official repository the following
steps should be applied. Apparently a complete clean, init-repository, configure
and make is needed.
1) Build
1.1) Apply the following patch
diff --git a/.gitmodules b/.gitmodules
index ba2aa2e..2483813 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,3 +79,6 @@
[submodule "qtgraphicaleffects"]
path = qtgraphicaleffects
url = git://gitorious.org/qt/qtgraphicaleffects.git
+[submodule "qtmof"]
+ path = qtmof
+ url = git://gitorious.org/qtplayground/qtmof.git
diff --git a/qtmof b/qtmof
new file mode 160000
index 0000000..1199941
--- /dev/null
+++ b/qtmof
@@ -0,0 +1 @@
+Subproject commit 119994178d59af28b850615968a64897ad8a7026
1.2) Apply the following patch
diff --git a/build.dependencies b/build.dependencies
index a979bf0..fba4688 100644
--- a/build.dependencies
+++ b/build.dependencies
@@ -31,6 +31,7 @@ use Config;
"qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
"qtwebkit-examples-and-demos" => "qtwebkit",
"qtxmlpatterns" => "qtbase",
+ "qtmof" => "qtbase",
);
@nondefault_modules = (
diff --git a/init-repository b/init-repository
index b63cf86..70f2391 100755
--- a/init-repository
+++ b/init-repository
@@ -245,6 +245,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
qtwayland
qtwebkit-examples-and-demos
qtxmlpatterns
+ qtmof
);
my $GERRIT_SSH_BASE
diff --git a/qt.pro b/qt.pro
index 63d31f2..8bde12f 100644
--- a/qt.pro
+++ b/qt.pro
@@ -113,6 +113,10 @@ module_qtgraphicaleffects.subdir = qtgraphicaleffects
module_qtgraphicaleffects.target = module-qtgraphicaleffects
module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative
+module_qtmof.subdir = qtmof
+module_qtmof.target = module-qtmof
+module_qtmof.depends = module_qtbase
+
# only qtbase is required to exist. The others may not - but it is the
# users responsibility to ensure that all needed dependencies exist, or
# it may not build.
@@ -194,3 +198,4 @@ exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
+exists(qtmof/qtmof.pro): SUBDIRS += module_qtmof
2) Documentation
2.1) Apply the following patch
diff --git a/doc/config/qt-project.qdocconf b/doc/config/qt-project.qdocconf
index c6c1f4b..d8ba88a 100644
--- a/doc/config/qt-project.qdocconf
+++ b/doc/config/qt-project.qdocconf
@@ -71,6 +71,8 @@ include($QT_CONTACTS_QDOCCONF)
include($QT_ORGANIZER_QDOCCONF)
include($QT_VERSIT_QDOCCONF)
include($QT_BLUETOOTH_QDOCCONF)
+include($QT_UML_QDOCCONF)
+include($QT_MOF_QDOCCONF)
imagedirs += images
diff --git a/doc/doc.pri b/doc/doc.pri
index d2f64ef..4a5eac3 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -48,7 +48,9 @@ MODULES = activeqt \
contacts \
organizer \
versit \
- bluetooth
+ bluetooth \
+ uml \
+ mof
# Pretend there is a doc module. Simplifies things a bit.
QT.doc.sources = $$dirname(PWD)
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 0fe1f68..d6bda9c 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -161,6 +161,16 @@
search via QML and C++ interfaces. Provides an NMEA backend for
positioning.
\row
+ \li \l{QtUml Module}{Qt UML}
+ \li All
+ \li
+ \li OMG's UML Qt-based implementation.
+ \row
+ \li \l{QtMof Module}{Qt MOF}
+ \li All
+ \li
+ \li OMG's Meta Object Facility (MOF) Qt-based implementation.
+ \row
\li \l{QtOpenGL}{Qt OpenGL}
\li
\li
2.2) Create the file qtdoc/doc/config/modules/qtmof.qdocconf containing:
# QT_MOF_SOURCES points to qtmof/src/mof
headerdirs += $QT_MOF_SOURCES \
$QT_MOF_SOURCES/../../examples/mof
sourcedirs += $QT_MOF_SOURCES \
$QT_MOF_SOURCES/../../examples/mof \
$QT_MOF_SOURCES/doc
exampledirs += $QT_MOF_SOURCES/../../examples/mof \
$QT_MOF_SOURCES/doc/snippets
imagedirs += $QT_MOF_SOURCES/doc/images
excludedirs += $QT_MOF_SOURCES/doc/snippets
Cpp.ignoretokens += \
QT_BEGIN_NAMESPACE_MOF \
QT_END_NAMESPACE_MOF \
QT_BEGIN_NAMESPACE_MOF_COMMON \
QT_END_NAMESPACE_MOF_COMMON \
QT_BEGIN_NAMESPACE_MOF_REFLECTION \
QT_END_NAMESPACE_MOF_REFLECTION \
Q_MOF_EXPORT
2.3) Create the file qtdoc/doc/config/modules/qtuml.qdocconf containing:
# QT_UML_SOURCES points to qtmof/src/uml
headerdirs += $QT_UML_SOURCES \
$QT_UML_SOURCES/../../examples/uml
sourcedirs += $QT_UML_SOURCES \
$QT_UML_SOURCES/../../examples/uml \
$QT_UML_SOURCES/doc
exampledirs += $QT_UML_SOURCES/../../examples/uml \
$QT_UML_SOURCES/doc/snippets
imagedirs += $QT_UML_SOURCES/doc/images
excludedirs += $QT_UML_SOURCES/doc/snippets
Cpp.ignoretokens += \
QT_BEGIN_NAMESPACE_UML \
QT_END_NAMESPACE_UML \
QT_BEGIN_NAMESPACE_UML_CLASSES \
QT_END_NAMESPACE_UML_CLASSES \
QT_BEGIN_NAMESPACE_UML_CLASSES_KERNEL \
QT_END_NAMESPACE_UML_CLASSES_KERNEL \
Q_UML_EXPORT
|
