diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 02:11:36 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 02:11:36 (GMT) |
| commit | d0b37af9b27849278fd56a83635c141525a912ce (patch) | |
| tree | 2c0c2c149d686b52c339a5b2135fde35659d7648 /doc/src/tutorials | |
| parent | 28b3eb37f7647450ccbac1365a06ffc6ba6a8584 (diff) | |
| parent | 84b619c1e8556c3e7ca79d799dfa705b63523370 (diff) | |
| download | Qt-d0b37af9b27849278fd56a83635c141525a912ce.zip Qt-d0b37af9b27849278fd56a83635c141525a912ce.tar.gz Qt-d0b37af9b27849278fd56a83635c141525a912ce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/tutorials/declarative.qdoc
Diffstat (limited to 'doc/src/tutorials')
| -rw-r--r-- | doc/src/tutorials/declarative.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/tutorials/declarative.qdoc b/doc/src/tutorials/declarative.qdoc index 61c9fdf..9b9c90f 100644 --- a/doc/src/tutorials/declarative.qdoc +++ b/doc/src/tutorials/declarative.qdoc @@ -77,7 +77,7 @@ sub directory the files are numbered in an order of increasing features. The code in this example is not compiled, but interpreted at run time. - This means you should use the duiviewer application provided with + This means you should use the qmlviewer application provided with Qt to run the examples. \list @@ -627,7 +627,7 @@ We then add a transition so that this becomes animated: - \snippet declarative/tutorials/contacts/3_Collections/2/ContactView.qml transition + \snippet declarative/tutorials/contacts/3_Collections/2/ContactView.qml transitions This allows the user to click on an item to enter the open state. @@ -640,7 +640,7 @@ And connect it's clicked value to some script to set the state of the delegate back to its default state. - \snippet declarative/tutorials/contacts/3_Collections/2/ContactView.qml connection + \snippet declarative/tutorials/contacts/3_Collections/2/ContactView.qml connections Something worth noting at this point is that every delegate created has this connection. It is important to check whether the delegate is the one in the open state, and |