diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 07:42:16 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 07:42:16 (GMT) |
| commit | f0eb658611f549470f0d90e141eda61ab9301838 (patch) | |
| tree | e234b73e10490e297033d645b744a7cbd26da4b9 /src/declarative/util/qmlxmllistmodel.cpp | |
| parent | ba9c21f7a1398ddcdeee6f010b1477d79f5bb8ce (diff) | |
| parent | 8f10ca802dee1ed110f301191c4a56a85575033c (diff) | |
| download | Qt-f0eb658611f549470f0d90e141eda61ab9301838.zip Qt-f0eb658611f549470f0d90e141eda61ab9301838.tar.gz Qt-f0eb658611f549470f0d90e141eda61ab9301838.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
doc/src/declarative/advtutorial1.qdoc
Diffstat (limited to 'src/declarative/util/qmlxmllistmodel.cpp')
| -rw-r--r-- | src/declarative/util/qmlxmllistmodel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qmlxmllistmodel.cpp b/src/declarative/util/qmlxmllistmodel.cpp index f765dce..06ef747 100644 --- a/src/declarative/util/qmlxmllistmodel.cpp +++ b/src/declarative/util/qmlxmllistmodel.cpp @@ -126,8 +126,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 *> |