From 9853ac3587655c97cf7f6a7fe282c997c2b19f5e Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Wed, 17 Feb 2010 12:01:24 +1000 Subject: Make compile on Symbian (call Q_DECLARE_METATYPE earlier) --- src/declarative/debugger/qmldebug.cpp | 1 - src/declarative/debugger/qmldebug_p.h | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp index 41e27bc..489eaa1 100644 --- a/src/declarative/debugger/qmldebug.cpp +++ b/src/declarative/debugger/qmldebug.cpp @@ -935,4 +935,3 @@ bool QmlDebugPropertyReference::hasNotifySignal() const QT_END_NAMESPACE -Q_DECLARE_METATYPE(QmlDebugObjectReference); diff --git a/src/declarative/debugger/qmldebug_p.h b/src/declarative/debugger/qmldebug_p.h index cd2adf6..58c66ec 100644 --- a/src/declarative/debugger/qmldebug_p.h +++ b/src/declarative/debugger/qmldebug_p.h @@ -361,6 +361,11 @@ private: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QmlDebugEngineReference) +Q_DECLARE_METATYPE(QmlDebugObjectReference) +Q_DECLARE_METATYPE(QmlDebugContextReference) +Q_DECLARE_METATYPE(QmlDebugPropertyReference) + QT_END_HEADER #endif // QMLDEBUG_H -- cgit v0.12 From ddd1428cd15cc19e7d0b9a1adaba2f889d17111f Mon Sep 17 00:00:00 2001 From: Bea Lam Date: Wed, 17 Feb 2010 12:07:33 +1000 Subject: Declare QmlXmlListModelRole meta type before any code uses it. --- src/declarative/util/qmlxmllistmodel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp index b2c2e61..df2102a 100644 --- a/src/declarative/util/qmlxmllistmodel.cpp +++ b/src/declarative/util/qmlxmllistmodel.cpp @@ -125,6 +125,10 @@ private: QString m_name; QString m_query; }; +QT_END_NAMESPACE +QML_DECLARE_TYPE(QmlXmlListModelRole) +QT_BEGIN_NAMESPACE + class QmlXmlListModelPrivate; struct QmlXmlRoleList : public QmlConcreteList @@ -723,6 +727,4 @@ void QmlXmlListModel::queryCompleted(int id, int size) QT_END_NAMESPACE -QML_DECLARE_TYPE(QmlXmlListModelRole) - #include -- cgit v0.12