diff options
author | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
---|---|---|
committer | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
commit | 53b018a42813e44787aa1edc35d59feaa86cf9d7 (patch) | |
tree | 7cce8f18faf26a87cfb5f27d1417c2a2ec86470c /doc/src/declarative/extending.qdoc | |
parent | 55c32b91a298d52bd7c29968d21b4b7a5ee741e4 (diff) | |
parent | afa22a20c1b89960b647b0e3a9dc390fe6f87eae (diff) | |
download | Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.zip Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.gz Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/extending.qdoc')
-rw-r--r-- | doc/src/declarative/extending.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index e23ca91..748ec6c 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -461,7 +461,7 @@ constructing an animation object and manually setting the animation's "target" property, a property value source can be assigned directly to a property of any type and automatically set up this association. -The example shown here is rather contrived: the \c announcment property of the +The example shown here is rather contrived: the \c announcement property of the \c BirthdayParty object is a string that is printed every time it is assigned and the \c HappyBirthdaySong value source generates the lyrics of the song "Happy Birthday". |