summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-11-19 03:01:28 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-11-19 03:01:28 (GMT)
commitbfe06c2531fa47d4d417ec22bdb184b06ad0f073 (patch)
treed6ac160858673797d7273ca0eb86dcf55e486bfe /doc
parentab08c7d19ae854a8ffdcc47c9ed4094b593297fa (diff)
parentd4e35bced214119c7d825eb9d3bd76c1114934ba (diff)
downloadQt-bfe06c2531fa47d4d417ec22bdb184b06ad0f073.zip
Qt-bfe06c2531fa47d4d417ec22bdb184b06ad0f073.tar.gz
Qt-bfe06c2531fa47d4d417ec22bdb184b06ad0f073.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/scope.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc
index 14efa59..fc678d1 100644
--- a/doc/src/declarative/scope.qdoc
+++ b/doc/src/declarative/scope.qdoc
@@ -215,7 +215,7 @@ Item { // Scope object for Script block 1
\endcode
One notable characteristic of the scope object is its interaction with \l {Attached Properties}.
-As attached properties exist on all object, an attached property reference that is not
+As attached properties exist on all objects, an attached property reference that is not
explicitly prefixed by an id will \e always resolve to the attached property on the scope
object.