diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 08:24:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 08:24:05 (GMT) |
| commit | e2f90ecdde9550986df1539aa88eb5fc41d939e1 (patch) | |
| tree | 354e192d83d1ed695373f085faa3a448e2599713 /doc/src/declarative/tutorial3.qdoc | |
| parent | 69b1784edb6dd82f26100d0e539bfa8a65bdd35d (diff) | |
| parent | 33eb76f050b45718d87926a8ff7afc89d6201c16 (diff) | |
| download | Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.zip Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.tar.gz Qt-e2f90ecdde9550986df1539aa88eb5fc41d939e1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
Replace QmlList* and QList* support with a single QmlListProperty type
Rename MouseRegion -> MouseArea
Update QmlChanges with animation API changes.
Document the default velocity of EaseFollow
Remove use of unexprted private classes.
Fix compile error on Solaris
Increase durations when testing Behaviors.
Add cached path rounded rect painting benchmark.
Remove use of direct event posting. Use QTest::keyClick() for keys.
Diffstat (limited to 'doc/src/declarative/tutorial3.qdoc')
| -rw-r--r-- | doc/src/declarative/tutorial3.qdoc | 2 |
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). |