diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-23 03:55:24 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-23 03:55:24 (GMT) |
| commit | a3fc3f37bf5884eb54cdde9367b3796558a6caf5 (patch) | |
| tree | b6d0468c4630e8d40b082699341a7209f1e56aac /doc | |
| parent | 0e8c19cd03512c33c0936dc59a64b248756c9e05 (diff) | |
| parent | 3386479da9526f0ae8978cd9e0afdd0559049ef9 (diff) | |
| download | Qt-a3fc3f37bf5884eb54cdde9367b3796558a6caf5.zip Qt-a3fc3f37bf5884eb54cdde9367b3796558a6caf5.tar.gz Qt-a3fc3f37bf5884eb54cdde9367b3796558a6caf5.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/qmlstates.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/declarative/qmlstates.qdoc b/doc/src/declarative/qmlstates.qdoc index 955f7de..078b718 100644 --- a/doc/src/declarative/qmlstates.qdoc +++ b/doc/src/declarative/qmlstates.qdoc @@ -51,9 +51,9 @@ To animate state changes, you can use \l{state-transitions}{transitions}. Other things you can do in a state change: \list -\o override signal handlers -\o change an item's parent -\o change an item's anchors -\o run some script +\o override signal handlers with PropertyChanges +\o change an item's parent with ParentChange +\o change an item's anchors with AnchorChanges +\o run some script with StateChangeScript */ |