summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-11-19 02:59:38 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-11-19 02:59:38 (GMT)
commitce914b37ee06e689af1bb5a2a1a932e9125f7276 (patch)
tree855010af303300f1a5ed01b5cae797602484e273 /doc/src
parentc72211c1f518adc53e12aaf70e47e966a50698d5 (diff)
parentbfe06c2531fa47d4d417ec22bdb184b06ad0f073 (diff)
downloadQt-ce914b37ee06e689af1bb5a2a1a932e9125f7276.zip
Qt-ce914b37ee06e689af1bb5a2a1a932e9125f7276.tar.gz
Qt-ce914b37ee06e689af1bb5a2a1a932e9125f7276.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-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.