Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv

Conflicts:
	src/declarative/canvas/qsimplecanvas.cpp
	src/declarative/canvas/qsimplecanvasdebugplugin.cpp
	src/declarative/canvas/qsimplecanvasdebugplugin_p.h
	src/declarative/fx/qfxpainteditem.cpp
	src/declarative/util/qfxview.cpp
	tools/qmlviewer/qmlviewer.h

1 files changed, 14 insertions, 1 deletions

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index 6adb397..f53a43b 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -89,6 +89,7 @@ Flipable {
                     // Center image if it is smaller than the flickable area.
                     x: ImageContainer.width > width*scale ? (ImageContainer.width - width*scale) / 2 : 0
                     y: ImageContainer.height > height*scale ? (ImageContainer.height - height*scale) / 2 : 0
+                    smooth: !Flick.moving
                     onStatusChanged : {
                         // Default scale shows the entire image.
                         if (status == 0 && width != 0) {
@@ -135,7 +136,19 @@ Flipable {
 
     transitions: [
         Transition {
-            NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 }
+            SequentialAnimation {
+                SetPropertyAction {
+                    target: BigImage
+                    property: "smooth"
+                    value: false
+                }
+                NumberAnimation { easing: "easeInOutQuad"; properties: "rotation"; duration: 500 }
+                SetPropertyAction {
+                    target: BigImage
+                    property: "smooth"
+                    value: !Flick.moving
+                }
+            }
         }
     ]
 }