diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 02:08:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 02:08:17 (GMT) |
| commit | 5b2d90a57c3722aa48edeaa58be2d55ae967a99d (patch) | |
| tree | c0602cea4552854b38169a519ee3222e047839fb /doc | |
| parent | b2b9dc03fc01a8387e74591642fa15b272845e2b (diff) | |
| parent | b3c94b923200dd9c98b66f4233c62e63a3ee79d4 (diff) | |
| download | Qt-5b2d90a57c3722aa48edeaa58be2d55ae967a99d.zip Qt-5b2d90a57c3722aa48edeaa58be2d55ae967a99d.tar.gz Qt-5b2d90a57c3722aa48edeaa58be2d55ae967a99d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add docs and tests for WorkerListModel.
Add accessor operations to VisualItemModel::children
Make "on" syntax mandatory for value sources and interceptors
Fix warning.
Minor optimization.
Test GridView.onAdd & GridView.onRemove. Reduce wait()s
Replace remaining QGuard usage with QDeclarativeGuard.
Reapply "Some animation cleanup/refactoring."
Setting the same source again causes reload.
Expand documention of status property with examples
Document TextEdit::textMargin
use ParentAnimation
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 1fd4dad..6cca39b 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -91,6 +91,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l VisualDataModel \o \l Package \o \l XmlListModel and XmlRole +\o \l WorkerListModel \o \l DateTimeFormatter \o \l NumberFormatter \endlist @@ -102,6 +103,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l Component \o \l Timer \o \l QtObject +\o \l WorkerScript \endlist \endtable |