Merge remote branch 'mainline/4.7' into 4.7

Conflicts:
	src/declarative/qml/qdeclarativeengine.cpp
	tools/qdoc3/htmlgenerator.cpp

1 files changed, 19 insertions, 10 deletions

diff --git a/examples/declarative/dynamic/qml/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml
index 3cbe64a..c04d3dc 100644
--- a/examples/declarative/dynamic/qml/PerspectiveItem.qml
+++ b/examples/declarative/dynamic/qml/PerspectiveItem.qml
@@ -1,16 +1,25 @@
 import Qt 4.7
 
 Image {
-    id: tree
+    id: rootItem
+
     property bool created: false
-    property double scaleFactor: Math.max((y+height-250)*0.01, 0.3)
-    property double scaledBottom: y + (height+height*scaleFactor)/2 
-    property bool onLand: scaledBottom > window.height/2
-    property string image //Needed for compatibility with GenericItem
+    property string image 
+
+    property double scaledBottom: y + (height + height*scale) / 2 
+    property bool onLand: scaledBottom > window.height / 2
+
+    source: image
     opacity: onLand ? 1 : 0.25
-    onCreatedChanged: if (created && !onLand) { tree.destroy() } else { z = scaledBottom }
-    scale: scaleFactor
-    transformOrigin: "Center"
-    source: image; smooth: true
-    onYChanged: z = scaledBottom
+    scale: Math.max((y + height - 250) * 0.01, 0.3)
+    smooth: true
+
+    onCreatedChanged: {
+        if (created && !onLand)
+            rootItem.destroy();
+        else
+            z = scaledBottom;
+    }
+
+    onYChanged: z = scaledBottom;
 }