diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-12-20 03:55:03 (GMT) |
| commit | 00fcb5e473e93546f999e45c78ed940b4d4caeeb (patch) | |
| tree | b84b34de6446e5a5f191fa5a501c63f7106d168a /doc/src | |
| parent | 3fe6eab1e6e451457b9c060b6b643b86d3f82557 (diff) | |
| parent | 95b0418a7ee7aee9658fd19b363e73d583af0b04 (diff) | |
| download | Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.zip Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.gz Qt-00fcb5e473e93546f999e45c78ed940b4d4caeeb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'doc/src')
| -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". |