diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-30 23:38:45 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-30 23:38:45 (GMT) |
| commit | 61fcaa0e659e1bc676e0ce4124d49aaae565b26c (patch) | |
| tree | e7071373a429da340e62bb7cfea0acb7029b63b4 /src/declarative/util/qmllistmodel.cpp | |
| parent | 9681d2190541c63a39b2cfe70dc3aaa161ebe703 (diff) | |
| download | Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.zip Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.gz Qt-61fcaa0e659e1bc676e0ce4124d49aaae565b26c.tar.bz2 | |
Support compile-in-namespace for the declarative module.
Diffstat (limited to 'src/declarative/util/qmllistmodel.cpp')
| -rw-r--r-- | src/declarative/util/qmllistmodel.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 1884e8b..c202a9f 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -49,6 +49,8 @@ #include <qmlbindablevalue.h> #include "qmllistmodel.h" +Q_DECLARE_METATYPE(QListModelInterface *) + QT_BEGIN_NAMESPACE #define DATA_ROLE_ID 1 @@ -67,8 +69,6 @@ struct ListModelData ListInstruction *instructions() const { return (ListInstruction *)((char *)this + sizeof(ListModelData)); } }; -Q_DECLARE_METATYPE(QListModelInterface *) - /*! \qmlclass ListModel \brief The ListModel element defines a free-form list data source. @@ -243,7 +243,6 @@ struct ModelNode ListModel *modelCache; ModelObject *objectCache; }; -Q_DECLARE_METATYPE(ModelNode *) ModelObject::ModelObject(ModelNode *node) : _node(node), _haveProperties(false), _mo(new QmlOpenMetaObject(this)) @@ -519,7 +518,6 @@ void ListModelParser::setCustomData(QObject *obj, const QByteArray &d) } } -QML_DECLARE_TYPE(ListModel) QML_DEFINE_CUSTOM_TYPE(ListModel, ListModel, ListModelParser) // ### FIXME @@ -527,7 +525,6 @@ class ListElement : public QObject { Q_OBJECT }; -QML_DECLARE_TYPE(ListElement) QML_DEFINE_TYPE(ListElement,ListElement) static void dump(ModelNode *node, int ind) @@ -568,4 +565,8 @@ ModelNode::~ModelNode() QT_END_NAMESPACE +Q_DECLARE_METATYPE(ModelNode *) +QML_DECLARE_TYPE(ListModel) +QML_DECLARE_TYPE(ListElement) + #include "qmllistmodel.moc" |