summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-08-24 04:57:10 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-08-24 05:49:13 (GMT)
commit70564bdb1856243640d11611515a83d339bb4f2f (patch)
tree861809d0bcecb26fd576d9b98b2d613f87776510 /doc
parent4ec82624f77d49c2e5f02b04518c8bde1be16145 (diff)
parent525e6674b002180d691a2d8a787dc512c259ae95 (diff)
downloadQt-70564bdb1856243640d11611515a83d339bb4f2f.zip
Qt-70564bdb1856243640d11611515a83d339bb4f2f.tar.gz
Qt-70564bdb1856243640d11611515a83d339bb4f2f.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/elements.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 6a285ba..ffa5494 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -132,9 +132,9 @@ The following table lists the QML elements provided by the Qt Declarative module
\o
\list
-\o \l VerticalPositioner
-\o \l HorizontalPositioner
-\o \l GridPositioner
+\o \l Column
+\o \l Row
+\o \l Grid
\endlist
\o