summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/elements.qdoc
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2010-04-27 00:39:42 (GMT)
committerPeter Yard <peter.yard@nokia.com>2010-04-27 00:39:42 (GMT)
commit88b2bf18c558d0e2f8a9268802f277212f17e61e (patch)
treed41ca52003037fba9b45605aa6d2ed86f73b940a /doc/src/declarative/elements.qdoc
parent4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff)
parent09293f1d07b019dc7bfe95afb93364cc87774e82 (diff)
downloadQt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip
Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz
Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/elements.qdoc')
-rw-r--r--doc/src/declarative/elements.qdoc7
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 8318392..6495f58 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -46,8 +46,6 @@
The following table lists the QML elements provided by the \l {QtDeclarative}{Qt Declarative} module.
-\bold {Standard Qt Declarative Elements}
-
\table 80%
\header
\o \bold {States}
@@ -81,6 +79,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
\o \l PropertyAction
\o \l ScriptAction
\o \l Transition
+\o \l SmoothedFollow
\o \l SpringFollow
\o \l Behavior
\endlist
@@ -109,11 +108,7 @@ The following table lists the QML elements provided by the \l {QtDeclarative}{Qt
\o \l QtObject
\o \l WorkerScript
\endlist
-\endtable
-\bold {QML Items}
-
-\table 80%
\header
\o \bold {Basic Visual Items}
\o \bold {Basic Interaction Items}