diff options
| author | Ville Pernu <ville.pernu@nokia.com> | 2010-12-17 09:15:44 (GMT) |
|---|---|---|
| committer | Ville Pernu <ville.pernu@nokia.com> | 2010-12-17 09:15:44 (GMT) |
| commit | 58123db900c339a7df8fb7f8b24e210fbfb70182 (patch) | |
| tree | 2fdc3ca1cec4927a8a74c446e2fa3963391087f8 /doc | |
| parent | d238b0ba236da4c3c33c0707d8dd6f5e5903d6c0 (diff) | |
| parent | 2be9663328aef7e77a525421f81247b7636f3164 (diff) | |
| download | Qt-58123db900c339a7df8fb7f8b24e210fbfb70182.zip Qt-58123db900c339a7df8fb7f8b24e210fbfb70182.tar.gz Qt-58123db900c339a7df8fb7f8b24e210fbfb70182.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
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". |