summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/declarative/debugger/qmldebug.cpp1
-rw-r--r--src/declarative/debugger/qmldebug_p.h5
-rw-r--r--src/declarative/util/qmlxmllistmodel.cpp6
3 files changed, 9 insertions, 3 deletions
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
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<QmlXmlListModelRole *>
@@ -723,6 +727,4 @@ void QmlXmlListModel::queryCompleted(int id, int size)
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QmlXmlListModelRole)
-
#include <qmlxmllistmodel.moc>