Merge remote branch 'origin/master' into 4.7

Conflicts:
	src/corelib/kernel/qmetatype.cpp
	src/declarative/graphicsitems/qdeclarativeevents.cpp
	src/declarative/graphicsitems/qdeclarativeflickable.cpp
	src/declarative/graphicsitems/qdeclarativegridview.cpp
	src/declarative/qml/qdeclarativescript.cpp
	src/declarative/util/qdeclarativeanimation.cpp
	src/declarative/util/qdeclarativebehavior.cpp
	src/declarative/util/qdeclarativeeasefollow.cpp
	src/declarative/util/qdeclarativefontloader.cpp
	src/declarative/util/qdeclarativelistmodel.cpp
	src/declarative/util/qdeclarativespringfollow.cpp
	src/declarative/util/qdeclarativestategroup.cpp
	src/declarative/util/qdeclarativesystempalette.cpp
	src/declarative/util/qdeclarativetimer.cpp
	src/declarative/util/qmlstateoperations.cpp
	src/multimedia/qml/qdeclarativeaudio.cpp
	src/multimedia/qml/qdeclarativevideo.cpp

1 files changed, 5 insertions, 9 deletions

diff --git a/examples/declarative/connections/connections.qml b/examples/declarative/connections/connections.qml
index 07f71bb..4692343 100644
--- a/examples/declarative/connections/connections.qml
+++ b/examples/declarative/connections/connections.qml
@@ -5,16 +5,12 @@ Rectangle {
     id: window; color: "#646464"
     width: 640; height: 480
 
-    function turnLeft() {
-        image.rotation -= 90
-    }
-    function turnRight() {
-        image.rotation += 90
-    }
+    property int angle: 0
 
     Image {
         id: image; source: "content/bg1.jpg"; anchors.centerIn: parent; transformOrigin: Item.Center
-        rotation: Behavior { NumberAnimation { easing: "easeOutCubic"; duration: 300 } }
+	rotation: window.angle
+        rotation: Behavior { NumberAnimation { easing.type: "OutCubic"; duration: 300 } }
     }
 
     Button {
@@ -26,6 +22,6 @@ Rectangle {
         anchors { right: parent.right; bottom: parent.bottom; rightMargin: 10; bottomMargin: 10 }
     }
 
-    Connection { sender: leftButton; signal: "clicked()"; script: window.turnLeft() }
-    Connection { sender: rightButton; signal: "clicked()"; script: window.turnRight() }
+    Connections { target: leftButton; onClicked: window.angle -= 90 }
+    Connections { target: rightButton; onClicked: window.angle += 90 }
 }