diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-14 03:13:30 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-14 03:13:30 (GMT) |
| commit | 2115c915ee0bb129ae6af82dce7138d52df7bfd7 (patch) | |
| tree | 0da1ba2ee77e6bff81521d05536faf2819f77bd3 /demos/declarative/flickr/common/ScrollBar.qml | |
| parent | 75c4dea93ad415dd9c79cb57ec5598e38789b28d (diff) | |
| parent | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (diff) | |
| download | Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.zip Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.tar.gz Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash
Diffstat (limited to 'demos/declarative/flickr/common/ScrollBar.qml')
| -rw-r--r-- | demos/declarative/flickr/common/ScrollBar.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/flickr/common/ScrollBar.qml b/demos/declarative/flickr/common/ScrollBar.qml index 4022d23..d70cd3c 100644 --- a/demos/declarative/flickr/common/ScrollBar.qml +++ b/demos/declarative/flickr/common/ScrollBar.qml @@ -19,7 +19,7 @@ Item { states: [ State { name: "show" - when: flickableArea.moving + when: flickableArea.movingVertically PropertyChanges { target: container opacity: 1 |