diff options
author | Bea Lam <bea.lam@nokia.com> | 2010-03-03 22:59:44 (GMT) |
---|---|---|
committer | Bea Lam <bea.lam@nokia.com> | 2010-03-03 22:59:44 (GMT) |
commit | 5ac068602871b78eb4b58634d58e6b8898acbf8d (patch) | |
tree | 0bbbf13392abbb723e4e496a8c0a640e99ef726a /doc | |
parent | 89e29d1f7a61f5cfa15cbce9b225a9d9ee9b4b7f (diff) | |
parent | 1a7df5ef1fc81fbf2d548c40e3feeb8ef3bb5a8c (diff) | |
download | Qt-5ac068602871b78eb4b58634d58e6b8898acbf8d.zip Qt-5ac068602871b78eb4b58634d58e6b8898acbf8d.tar.gz Qt-5ac068602871b78eb4b58634d58e6b8898acbf8d.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/declarative/tutorial.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc index 98efe12..310b776 100644 --- a/doc/src/declarative/tutorial.qdoc +++ b/doc/src/declarative/tutorial.qdoc @@ -173,10 +173,10 @@ In this case the rectangle will have the same size as its parent (see \l{anchor- \snippet examples/declarative/tutorials/helloworld/Cell.qml 3 -In order to change the color of the text when clicking on a cell, we create a \l MouseRegion element with +In order to change the color of the text when clicking on a cell, we create a \l MouseArea element with the same size as its parent. -A \l MouseRegion defines a signal called \e clicked. +A \l MouseArea defines a signal called \e clicked. When this signal is triggered we want to emit our own \e clicked signal with the color as parameter. \section2 The main QML file @@ -214,7 +214,7 @@ Here is the QML code: \snippet examples/declarative/tutorials/helloworld/tutorial3.qml 2 First, we create a new \e down state for our text element. -This state will be activated when the \l MouseRegion is pressed, and deactivated when it is released. +This state will be activated when the \l MouseArea is pressed, and deactivated when it is released. The \e down state includes a set of property changes from our implicit \e {default state} (the items as they were initially defined in the QML). |