Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	doc/src/declarative/dynamicobjects.qdoc
	doc/src/declarative/elements.qdoc

1 files changed, 9 insertions, 2 deletions

diff --git a/examples/declarative/touchinteraction/pincharea/flickresize.qml b/examples/declarative/touchinteraction/pincharea/flickresize.qml
index a2f81ff1d6..9439acea48 100644
--- a/examples/declarative/touchinteraction/pincharea/flickresize.qml
+++ b/examples/declarative/touchinteraction/pincharea/flickresize.qml
@@ -54,14 +54,21 @@ Rectangle {
         PinchArea {
             width: Math.max(flick.contentWidth, flick.width)
             height: Math.max(flick.contentHeight, flick.height)
+
+            property real initialWidth
+            property real initialHeight
+            onPinchStarted: {
+                initialWidth = flick.contentWidth
+                initialHeight = flick.contentHeight
+            }
+
             onPinchUpdated: {
                 // adjust content pos due to drag
                 flick.contentX += pinch.previousCenter.x - pinch.center.x
                 flick.contentY += pinch.previousCenter.y - pinch.center.y
 
                 // resize content
-                var scale = 1.0 + pinch.scale - pinch.previousScale
-                flick.resizeContent(flick.contentWidth * scale, flick.contentHeight * scale, pinch.center)
+                flick.resizeContent(initialWidth * pinch.scale, initialHeight * pinch.scale, pinch.center)
             }
 
             onPinchFinished: {