summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/qdeclarativestates.qdoc
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-10-05 22:00:13 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-10-05 22:00:13 (GMT)
commitcbd26879cb942a2c4ee7ccd919ee18a45b5b87bb (patch)
treebeb5782a54a102fad2ed78c8231f6ef093ceada9 /doc/src/declarative/qdeclarativestates.qdoc
parente3bcf44684aa30271c986911b328c9d9c372912a (diff)
parent591807899deb3fc479bd32722756f74b899977d5 (diff)
downloadQt-cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb.zip
Qt-cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb.tar.gz
Qt-cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc/src/declarative/qdeclarativestates.qdoc')
-rw-r--r--doc/src/declarative/qdeclarativestates.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc
index d5d7a96..b663d43 100644
--- a/doc/src/declarative/qdeclarativestates.qdoc
+++ b/doc/src/declarative/qdeclarativestates.qdoc
@@ -221,7 +221,7 @@ Rectangle {
This \l Transition defines that if any \c x or \c y properties have changed
during a state change within this item, their values should be animated over 500
-millliseconds.
+milliseconds.
See the \l Transitions documentation for more information.