summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-08-20 06:29:59 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-08-20 06:29:59 (GMT)
commitf3ed6a6156c49ae6e17cd259e6e9b0bc1100f280 (patch)
treecd508e70d59f01e96b360ef5c2aca08813961b7b /doc/src
parentefe920cb2873facc7f9b21f77b678628e9c3dcb2 (diff)
parent3b688b3d3acc740a9941d6240f9e4c83c04847a7 (diff)
downloadQt-f3ed6a6156c49ae6e17cd259e6e9b0bc1100f280.zip
Qt-f3ed6a6156c49ae6e17cd259e6e9b0bc1100f280.tar.gz
Qt-f3ed6a6156c49ae6e17cd259e6e9b0bc1100f280.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/qmlintro.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/qmlintro.qdoc b/doc/src/declarative/qmlintro.qdoc
index ced2d68..fec8f11 100644
--- a/doc/src/declarative/qmlintro.qdoc
+++ b/doc/src/declarative/qmlintro.qdoc
@@ -200,7 +200,7 @@ If a list property has been the default property, it means the property tag can
\code
State {
- operations: [
+ changes: [
SetProperties {},
SetProperties {}
]