diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-17 23:00:12 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-17 23:00:12 (GMT) |
| commit | 12bd296466225321e753f1fda3efb8dda06b2c21 (patch) | |
| tree | ff64ca927ca01830dcbd18ca3be9be057661b987 /doc | |
| parent | f021555182edb4163d1bca29ed16da6748029771 (diff) | |
| parent | 0d3786a9cd6dc3c4dd17a7e98fe138a7abaabb29 (diff) | |
| download | Qt-12bd296466225321e753f1fda3efb8dda06b2c21.zip Qt-12bd296466225321e753f1fda3efb8dda06b2c21.tar.gz Qt-12bd296466225321e753f1fda3efb8dda06b2c21.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc')
| -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". |