diff options
author | Bea Lam <bea.lam@nokia.com> | 2010-07-14 01:51:22 (GMT) |
---|---|---|
committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-26 07:05:33 (GMT) |
commit | 3f0bae81dc23ecec747907cb5525ed383867801a (patch) | |
tree | 054ca46d0f0604ff644d46412ed0f221218542b9 /doc/src | |
parent | 6ff23f2b2d96e852ed1fff0ecef0e8ee28ec82e7 (diff) | |
download | Qt-3f0bae81dc23ecec747907cb5525ed383867801a.zip Qt-3f0bae81dc23ecec747907cb5525ed383867801a.tar.gz Qt-3f0bae81dc23ecec747907cb5525ed383867801a.tar.bz2 |
improvements to docs and examples
(cherry picked from commit 07ebc9161263c04dc072b9fc2a922b9665cbe7be)
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/declarative/anchor-layout.qdoc | 5 | ||||
-rw-r--r-- | doc/src/declarative/basictypes.qdoc | 3 | ||||
-rw-r--r-- | doc/src/images/qml-mousearea-example.png | bin | 5527 -> 6969 bytes | |||
-rw-r--r-- | doc/src/images/qml-xmllistmodel-example.png | bin | 0 -> 5252 bytes | |||
-rw-r--r-- | doc/src/snippets/declarative/mousearea.qml | 13 |
5 files changed, 14 insertions, 7 deletions
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc index 9c217e1..5c025e5 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/doc/src/declarative/anchor-layout.qdoc @@ -33,7 +33,10 @@ In addition to the more traditional \l Grid, \l Row, and \l Column, QML also provides a way to layout items using the concept of \e anchors. Each item can be thought of as having a set of 7 invisible "anchor lines": -\e left, \e horizontalCenter, \e right, \e top, \e verticalCenter, \e baseline, and \e bottom. +\l {Item::anchors.left}{left}, \l {Item::anchors.horizontalCenter}{horizontalCenter}, +\l {Item::anchors.right}{right}, \l {Item::anchors.top}{top}, +\l {Item::anchors.verticalCenter}{verticalCenter}, \l {Item::anchors.baseline}{baseline}, +and \l {Item::anchors.bottom}{bottom}. \image edges_qml.png diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index 159f40d..6aa1808 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -107,6 +107,9 @@ Text { text: "Hello world!" } \endqml + Strings have a \c length attribute that holds the number of + characters in the string. + \sa {QML Basic Types} */ diff --git a/doc/src/images/qml-mousearea-example.png b/doc/src/images/qml-mousearea-example.png Binary files differindex c6e52d6..c0eef7f 100644 --- a/doc/src/images/qml-mousearea-example.png +++ b/doc/src/images/qml-mousearea-example.png diff --git a/doc/src/images/qml-xmllistmodel-example.png b/doc/src/images/qml-xmllistmodel-example.png Binary files differnew file mode 100644 index 0000000..be2d15d --- /dev/null +++ b/doc/src/images/qml-xmllistmodel-example.png diff --git a/doc/src/snippets/declarative/mousearea.qml b/doc/src/snippets/declarative/mousearea.qml index 8e7c737..fb6cba0 100644 --- a/doc/src/snippets/declarative/mousearea.qml +++ b/doc/src/snippets/declarative/mousearea.qml @@ -83,17 +83,18 @@ Rectangle { id: container width: 600; height: 200 - Image { - id: pic - source: "pics/qt.png" - opacity: (600.0 - pic.x) / 600 + Rectangle { + id: rect + width: 50; height: 50 + color: "red" + opacity: (600.0 - rect.x) / 600 MouseArea { anchors.fill: parent - drag.target: pic + drag.target: rect drag.axis: Drag.XAxis drag.minimumX: 0 - drag.maximumX: container.width - pic.width + drag.maximumX: container.width - rect.width } } } |