diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 17:19:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 17:19:32 (GMT) |
| commit | ba7677f77c35f7e6be9d8330d4e539d816cc33fd (patch) | |
| tree | 5e6d0eeba0617b5d17781e66edb312574c66a3b9 /doc/src | |
| parent | 7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd (diff) | |
| parent | 4eaa7599be17d0838f98e2bafb0f0c8a0787530e (diff) | |
| download | Qt-ba7677f77c35f7e6be9d8330d4e539d816cc33fd.zip Qt-ba7677f77c35f7e6be9d8330d4e539d816cc33fd.tar.gz Qt-ba7677f77c35f7e6be9d8330d4e539d816cc33fd.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: (37 commits)
Add minehunt README
Refactor demos
Rewrite Minehunt demo to use the runtime.
Adapted example to use the import mechanism
Compile fix on Windows
Build fix on windows
Fix qml import modules loading on Windows
Let the 'qml' runtime use its applicationDirPath as importsPath
Moved qdeclarativemodules to imports
Add "on" syntax to QmlChanges.txt
Don't return QDeclarativeDeclarativeData for a deleting object
Empty URL test
Fix zooming (broke with transformOrigin default change).
doc
Move WebView to an extension plugin.
follow syntax change
missed file
Optimization.
Add autotests for script block scoping.
Make test more reliable.
...
Diffstat (limited to 'doc/src')
| -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 |