summaryrefslogtreecommitdiffstats
path: root/examples/tutorials
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-09-16 22:00:18 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-09-16 22:00:18 (GMT)
commit0f71215693713fef4fd9dabeae8e6a574deff415 (patch)
tree27d8a11e29f87813df5cbb644389cbfdfebc1abb /examples/tutorials
parentacab3259e9f57e436f475b4c0d1d7e7fb194e983 (diff)
parentfc007d0a99cc52e673c5d2606e5076831f6103b1 (diff)
downloadQt-0f71215693713fef4fd9dabeae8e6a574deff415.zip
Qt-0f71215693713fef4fd9dabeae8e6a574deff415.tar.gz
Qt-0f71215693713fef4fd9dabeae8e6a574deff415.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'examples/tutorials')
-rw-r--r--examples/tutorials/gettingStarted/gsQml/texteditor.qml4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
index 3bd9d55..5a75e0b 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]
}