diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 06:51:54 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 06:51:54 (GMT) |
| commit | bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88 (patch) | |
| tree | 4849d88509b994c65fbb1737a778c09f5cce0cd3 /doc | |
| parent | 49d56ab243a5f490495a79ce98276e2f33c03658 (diff) | |
| parent | e993f05e5b927909978e355b0bdea4c1406acafb (diff) | |
| download | Qt-bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88.zip Qt-bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88.tar.gz Qt-bf2f5fbd01b49dad9a2bdfd20d1ccba03936bf88.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/declarative/scope.qdoc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index e62d546..8091f95 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -179,6 +179,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l Column \o \l Row \o \l Grid +\o \l Flow \endlist \o diff --git a/doc/src/declarative/scope.qdoc b/doc/src/declarative/scope.qdoc index c588b45..964f7d5 100644 --- a/doc/src/declarative/scope.qdoc +++ b/doc/src/declarative/scope.qdoc @@ -160,7 +160,7 @@ Bindings have access to the scope object's properties without qualification. In the previous example, the binding accesses the \l Item's \c parent property directly, without needing any form of object prefix. QML introduces a more structured, object-oriented approach to JavaScript, and consequently does not -require (although it does support) use of the implicit \c this property. +require the use of the JavaScript \c this property. Care must be used when accessing \l {Attached Properties} from bindings due to their interaction with the scope object. Conceptually attached properties |