summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-01 06:47:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-01 06:47:19 (GMT)
commit621a470e1c996c471a5a4492a0b71a75b1add6d4 (patch)
tree5c0894d25eaea93bb7e931bafdd09708294e12ce /doc
parent006d3ee14b37f243ef4765d4252cfb1a61648f14 (diff)
downloadQt-621a470e1c996c471a5a4492a0b71a75b1add6d4.zip
Qt-621a470e1c996c471a5a4492a0b71a75b1add6d4.tar.gz
Qt-621a470e1c996c471a5a4492a0b71a75b1add6d4.tar.bz2
Add media elements to the QML Elements docs.
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/elements.qdoc21
1 files changed, 12 insertions, 9 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 9cbf58b..2f9e7bf 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -111,8 +111,8 @@ The following table lists the QML elements provided by the Qt Declarative module
\header
\o \bold {Basic Visual Items}
\o \bold {Basic Interaction Items}
-\o \bold {Widgets}
\o \bold {Utility}
+\o \bold {Transforms}
\row
\o
@@ -130,13 +130,8 @@ The following table lists the QML elements provided by the Qt Declarative module
\list
\o \l MouseArea
\o \l FocusScope
-\endlist
-
-\o
-\list
\o \l Flickable
\o \l Flipable
-\o \l WebView
\endlist
\o
@@ -148,10 +143,16 @@ The following table lists the QML elements provided by the Qt Declarative module
\o \l LayoutItem
\endlist
+\o
+\list
+\o \l Scale
+\o \l Rotation
+\endlist
+
\header
\o \bold {Views}
\o \bold {Positioners}
-\o \bold {Transforms}
+\o \bold {Media}
\o \bold {Effects}
\row
@@ -172,6 +173,7 @@ The following table lists the QML elements provided by the Qt Declarative module
\o \l PathPercent
\endlist
\endlist
+\o \l WebView
\endlist
\o
@@ -184,8 +186,9 @@ The following table lists the QML elements provided by the Qt Declarative module
\o
\list
-\o \l Scale
-\o \l Rotation
+\o \l SoundEffect
+\o \l Audio
+\o \l Video
\endlist
\o