summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/tutorial3.qdoc
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2010-02-23 08:24:31 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2010-02-23 08:24:31 (GMT)
commita948f901b196bab121cb8b5736204b4ce0c09e94 (patch)
treee87ac8e797b93203998c1bbb32c2e1120567b137 /doc/src/declarative/tutorial3.qdoc
parentac99b3e243b331d26815b80aab97cdaf0ed06b0f (diff)
parent2e417e2a3963151a2b3a3033e6f5bb0e106d8db4 (diff)
downloadQt-a948f901b196bab121cb8b5736204b4ce0c09e94.zip
Qt-a948f901b196bab121cb8b5736204b4ce0c09e94.tar.gz
Qt-a948f901b196bab121cb8b5736204b4ce0c09e94.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src/declarative/tutorial3.qdoc')
-rw-r--r--doc/src/declarative/tutorial3.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index 323395e..8293ef8 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -58,7 +58,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).