summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-16 05:50:15 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-16 05:50:15 (GMT)
commit1c1465587ed116695171a73deffa1dc0729856d0 (patch)
tree9d6734313df1ef0fce7ca32b3dae39cbd9da915a /doc
parenta32cd00668076674b6968b821d4b7377c95ddee9 (diff)
parentfcfc3a68a525c32d4550068d7cf47bb3a5816da6 (diff)
downloadQt-1c1465587ed116695171a73deffa1dc0729856d0.zip
Qt-1c1465587ed116695171a73deffa1dc0729856d0.tar.gz
Qt-1c1465587ed116695171a73deffa1dc0729856d0.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/elements.qdoc1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 0d7fe3b..75f8b97 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -94,7 +94,6 @@ 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
\endlist
\o