summaryrefslogtreecommitdiffstats
path: root/doc/src/tutorials
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-07-31 02:34:31 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-07-31 02:34:31 (GMT)
commit9e7796e63a412efa0cbbba518523c163a097cd48 (patch)
treed6bc3448229820f20e149c1460311fe6c583f1af /doc/src/tutorials
parent355649ce9d4f320ed4ebb0a31d86427ade43f2ce (diff)
parentd603edf69f49336bc832b6ee4bb12fbd99d2e50f (diff)
downloadQt-9e7796e63a412efa0cbbba518523c163a097cd48.zip
Qt-9e7796e63a412efa0cbbba518523c163a097cd48.tar.gz
Qt-9e7796e63a412efa0cbbba518523c163a097cd48.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/tutorials')
-rw-r--r--doc/src/tutorials/declarative.qdoc16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc
index 3fad672..b7a4d7d 100644
--- a/doc/src/tutorials/declarative.qdoc
+++ b/doc/src/tutorials/declarative.qdoc
@@ -402,9 +402,9 @@
This can be useful when the component is not complex enough to justify its
own file. The third way to reuse components allows for delaying loading
- of the QML until some later event. Each \l{Item}{Item} includes
- a special child, qmlItem, which has its definition provided by the
- contents of the qml property of its parent.
+ of the QML until some later event. \l{Loader}{Loader} includes
+ a special child, item, which has its definition provided by the
+ contents of the source property of the loader.
\snippet declarative/tutorials/contacts/2_Reuse/1a/ContactField.qml load
@@ -656,8 +656,8 @@
\snippet declarative/tutorials/contacts/3_Collections/3/ContactView.qml setting qml
- Each item has a qml property that represents the filename for the contents of
- a special qmlItem child of the \l{Item}{Item}. By setting the qml property of the Details
+ \l{Loader}{Loader} has a source property that represents the filename for the contents of
+ a special item child of the \l{Loader}{Loader}. By setting the source property of the Details
component on clicking the mouse region, the more complex component isn't loaded
until needed. The down side about this though is the properties of Contact
cannot be set until the item is loaded. This requires using the Bind element.
@@ -667,8 +667,8 @@
Unlike binding a value to the property of a component directly, the Bind element
allows both the target and the property set to themselves be to dynamic values.
- This means that when the qml property is set, it will change the
- qmlItem property of the Details component. This in turn triggers the Bind
- elements to set the required properties of the qmlItem, which is now
+ This means that when the source property is set, it will change the
+ item property of the Details component. This in turn triggers the Bind
+ elements to set the required properties of the item, which is now
an instance of the Contact component.
*/