diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 06:58:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 06:58:40 (GMT) |
| commit | f5668a63a9396b8f21a62a3a780f1e0023715806 (patch) | |
| tree | 88cad63bd0dfea70bcf54e3eed57b8a11189fd29 /src/declarative/util/qmlxmllistmodel.cpp | |
| parent | fd3f9dd0f31efeea3aa0ec28b54c70d85712c7ba (diff) | |
| parent | 060d833d3e0fd5a99876e0717fb26ef93fae30e1 (diff) | |
| download | Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.zip Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.tar.gz Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Add missing NOTIFY signals to various QML item class properties
Fix currentIndex after itemsMoved()
qmlviewer: build on symbian
Revert "Replace QList<>* support with QmlListProperty"
Declare QmlXmlListModelRole meta type before any code uses it.
Make compile on Symbian (call Q_DECLARE_METATYPE earlier)
Conditionally link webkit on wince
Revert "Run dos2unix on these files."
Expose LayoutItem documentation
Fix palette on the N900
Fix QTBUG-8090, improve original patch effectiveness.
Replace QList<>* support with QmlListProperty
Run dos2unix on these files.
Remove standalone QmlDebugger. It is now only available through the
Mobility 404
Fix crash in QmlMetaProperty that could occur when using value-type
QML binding optimizer crash
QML binding optimizer crash
Fix crash in QML binding optimizer
Don't delete binding directly
...
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 d586792..3612369 100644 --- a/src/declarative/util/qmlxmllistmodel.cpp +++ b/src/declarative/util/qmlxmllistmodel.cpp @@ -125,8 +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 *> |