summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-11-03 01:56:12 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-11-03 01:56:12 (GMT)
commit6a8718838ab002237540fb8490063a410ee4f95d (patch)
tree7b04648e32efed413f996bf3f989d8f07a0ba541 /doc/src
parent9063457d08b2bcc8c055f6f0370f73360e6ec1dc (diff)
parent203232ffdc781eff1e320eb8f20311913640e163 (diff)
downloadQt-6a8718838ab002237540fb8490063a410ee4f95d.zip
Qt-6a8718838ab002237540fb8490063a410ee4f95d.tar.gz
Qt-6a8718838ab002237540fb8490063a410ee4f95d.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/elements.qdoc7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 0eda95e..69535ce 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -60,9 +60,10 @@ The following table lists the QML elements provided by the Qt Declarative module
\list
\o \l State
\o \l PropertyChanges
-\o \l ParentChange
-\o \l StateChangeScript
-\o \l AnchorChanges
+\o \l StateGroup
+\o \l ParentChange (Item-specific)
+\o \l StateChangeScript (Item-specific)
+\o \l AnchorChanges (Item-specific)
\endlist
\o