diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-28 05:05:49 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-28 05:05:49 (GMT) |
commit | 1545a7f0e67cc125a116f0d72b81cb325a675381 (patch) | |
tree | 486820827b02ede1eab5f713baa38e9e7098cb7b /examples | |
parent | f6b063eeef71b4cb7c1cff090166201f794c9679 (diff) | |
parent | 1f8a4748e860d259d525e47426fd3a1072d9fb5c (diff) | |
download | Qt-1545a7f0e67cc125a116f0d72b81cb325a675381.zip Qt-1545a7f0e67cc125a116f0d72b81cb325a675381.tar.gz Qt-1545a7f0e67cc125a116f0d72b81cb325a675381.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples')
-rw-r--r-- | examples/declarative/listview/listview.qml | 1 | ||||
-rw-r--r-- | examples/declarative/parallax/ParallaxView.qml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/declarative/listview/listview.qml b/examples/declarative/listview/listview.qml index b614904..92acce1 100644 --- a/examples/declarative/listview/listview.qml +++ b/examples/declarative/listview/listview.qml @@ -72,5 +72,6 @@ Rectangle { preferredHighlightBegin: 125 preferredHighlightEnd: 125 highlightRangeMode: "StrictlyEnforceRange" + flickDeceleration: 1000 } } diff --git a/examples/declarative/parallax/ParallaxView.qml b/examples/declarative/parallax/ParallaxView.qml index bad9b85..50ab72c 100644 --- a/examples/declarative/parallax/ParallaxView.qml +++ b/examples/declarative/parallax/ParallaxView.qml @@ -25,7 +25,8 @@ Item { anchors.fill: parent model: VisualItemModel { id: visualModel } - highlight: Item { height: 1; width: 1} + highlight: Rectangle { height: 1; width: 1 } + highlightMoveSpeed: 2000 preferredHighlightBegin: 0 preferredHighlightEnd: 0 highlightRangeMode: "StrictlyEnforceRange" |