summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-01-15 04:29:47 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-01-15 04:29:47 (GMT)
commit72480e97f0eb4ef49b380e46899a976cf97e78c4 (patch)
tree4aea0651fafe0eb8503195e13927588adf97d48b /doc/src
parent4a665ff5da05860f5eb46e3982ef3d8163a6cf59 (diff)
parentd45e7d09675f5dca5d18e2810c8cd8ae6b023279 (diff)
downloadQt-72480e97f0eb4ef49b380e46899a976cf97e78c4.zip
Qt-72480e97f0eb4ef49b380e46899a976cf97e78c4.tar.gz
Qt-72480e97f0eb4ef49b380e46899a976cf97e78c4.tar.bz2
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/extending.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 84d7089..893838f 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -296,7 +296,7 @@ identified through the use of the attacher type name, in the case shown
\c BirthdayParty, as a suffix to the property name.
In the example shown, \c BirthdayParty is called the attaching type, and the
-Box instance the attachee object instance.
+Boy instance the attachee object instance.
For the attaching type, an attached property block is implemented as a new
QObject derived type, called the attachment object. The properties on the