diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-17 04:23:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-17 04:23:26 (GMT) |
| commit | 2be9663328aef7e77a525421f81247b7636f3164 (patch) | |
| tree | 32ab6cc6928e13b9e8326f4973665bc47a45be87 | |
| parent | 640aad736476f7f8a4ec92fedecae234fb2e2d2e (diff) | |
| parent | 7857e0cf4673fb0defab5af9c60d0c2dea93e55c (diff) | |
| download | Qt-2be9663328aef7e77a525421f81247b7636f3164.zip Qt-2be9663328aef7e77a525421f81247b7636f3164.tar.gz Qt-2be9663328aef7e77a525421f81247b7636f3164.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: typo fixed in 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". |