summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmetaobjectbuilder_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-09-15 06:23:30 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-09-15 06:23:30 (GMT)
commit8cad28ef7abf92cab034ae3586e24cd0b8be38a2 (patch)
treefb0df99424689a9b7dd4f25562ded7863f6e82cc /src/declarative/qml/qmetaobjectbuilder_p.h
parentf6c08f5e68c90338a8402c0912cd6be72e84b1e6 (diff)
downloadQt-8cad28ef7abf92cab034ae3586e24cd0b8be38a2.zip
Qt-8cad28ef7abf92cab034ae3586e24cd0b8be38a2.tar.gz
Qt-8cad28ef7abf92cab034ae3586e24cd0b8be38a2.tar.bz2
Build on S60.
Diffstat (limited to 'src/declarative/qml/qmetaobjectbuilder_p.h')
-rw-r--r--src/declarative/qml/qmetaobjectbuilder_p.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/qml/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h
index d503163..18277aa 100644
--- a/src/declarative/qml/qmetaobjectbuilder_p.h
+++ b/src/declarative/qml/qmetaobjectbuilder_p.h
@@ -135,7 +135,11 @@ public:
int addClassInfo(const QByteArray& name, const QByteArray& value);
+#ifdef Q_NO_DATA_RELOCATION
+ int addRelatedMetaObject(const QMetaObjectAccessor &meta);
+#else
int addRelatedMetaObject(const QMetaObject *meta);
+#endif
void addMetaObject(const QMetaObject *prototype, QMetaObjectBuilder::AddMembers members = AllMembers);
@@ -180,7 +184,7 @@ public:
#endif
private:
- Q_DISABLE_COPY(QMetaObjectBuilder);
+ Q_DISABLE_COPY(QMetaObjectBuilder)
QMetaObjectBuilderPrivate *d;