diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /examples/tutorials/gettingStarted/gsQml/texteditor.qml | |
parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'examples/tutorials/gettingStarted/gsQml/texteditor.qml')
-rw-r--r-- | examples/tutorials/gettingStarted/gsQml/texteditor.qml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml index 3bd9d5572b..5a75e0baa4 100644 --- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml +++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml @@ -100,6 +100,7 @@ Rectangle { } } +//! [states] states:[ State { name: "DRAWER_OPEN" @@ -116,7 +117,9 @@ Rectangle { PropertyChanges { target: arrowIcon; rotation: 0 } } ] +//! [states] +//! [transitions] transitions: [ Transition { to: "*" @@ -125,4 +128,5 @@ Rectangle { NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo } } ] +//! [transitions] } |