summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-05-11 03:33:48 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-05-12 05:37:17 (GMT)
commit71187a1f0d26ff61c033a7c2d46892f48816fc45 (patch)
tree0234f975938886f4b675a794a56a829a87d89c5f /examples/declarative
parent798bdb4543f84d427659b950a3a1643ae4987b8b (diff)
downloadQt-71187a1f0d26ff61c033a7c2d46892f48816fc45.zip
Qt-71187a1f0d26ff61c033a7c2d46892f48816fc45.tar.gz
Qt-71187a1f0d26ff61c033a7c2d46892f48816fc45.tar.bz2
Flickable small API changes.
- Split moving into movingHorizontally anf movingVertically - Split flicking into flickingHorizontally and flickingVertically - Rename flickDirection to flickableDirection - onMovementStarted, onMovementEnded, onFlickStarted and onFlickEnded signals removed Task-number: QTBUG-10572 Reviewed-by: Martin Jones
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/listview/dynamic.qml2
-rw-r--r--examples/declarative/scrollbar/display.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 9b05ad5..64f324e 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -151,7 +151,7 @@ Rectangle {
// Only show the scrollbar when the view is moving.
states: State {
- name: "ShowBars"; when: view.moving
+ name: "ShowBars"; when: view.movingVertically
PropertyChanges { target: verticalScrollBar; opacity: 1 }
}
transitions: Transition {
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index b8a5e36..6b12d85 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -20,7 +20,7 @@ Rectangle {
// Only show the scrollbars when the view is moving.
states: State {
name: "ShowBars"
- when: view.moving
+ when: view.movingVertically || view.movingHorizontally
PropertyChanges { target: verticalScrollBar; opacity: 1 }
PropertyChanges { target: horizontalScrollBar; opacity: 1 }
}