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, 14 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativepathview/data/path.qml b/tests/auto/declarative/qdeclarativepathview/data/path.qml
new file mode 100644
index 0000000..7e82a48
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/path.qml
@@ -0,0 +1,14 @@
+import Qt 4.6
+
+Path {
+    startX: 120; startY: 100
+
+    PathAttribute { name: "scale"; value: 1.0 }
+    PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
+    PathPercent { value: 0.3 }
+    PathLine { x: 120; y: 100 }
+    PathCubic {
+        x: 180; y: 0; control1X: -10; control1Y: 90
+        control2X: 210; control2Y: 90
+    }
+}