diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-12-20 12:32:14 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-12-20 12:32:14 (GMT) |
| commit | 2f1268b9fd29d09279b6f6ad3d85d99a3c8f1288 (patch) | |
| tree | e6825364135d5fbe8e3a0f3f927f409d51cdd3f0 /doc | |
| parent | d491aee7887331e6b1207e647f4d2ee3f43efacd (diff) | |
| parent | ea05d5ecd7ead66d22a8e319e8fdc40206b8b679 (diff) | |
| download | Qt-2f1268b9fd29d09279b6f6ad3d85d99a3c8f1288.zip Qt-2f1268b9fd29d09279b6f6ad3d85d99a3c8f1288.tar.gz Qt-2f1268b9fd29d09279b6f6ad3d85d99a3c8f1288.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team 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". |