diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-13 05:09:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-13 05:09:35 (GMT) |
| commit | 58ed26c320fba396c71a809ed61853683ebe696a (patch) | |
| tree | 0deedcd64de2534db0ec3ee5af1342ce7494836f /examples/declarative | |
| parent | ae8e4afcadc9ff084e1d1859c29fbc8b629e3392 (diff) | |
| parent | ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe (diff) | |
| download | Qt-58ed26c320fba396c71a809ed61853683ebe696a.zip Qt-58ed26c320fba396c71a809ed61853683ebe696a.tar.gz Qt-58ed26c320fba396c71a809ed61853683ebe696a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/listview/dynamic.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/scrollbar/display.qml | 2 |
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 } } |