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

diff --git a/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml b/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
new file mode 100644
index 0000000..dbb2a24
--- /dev/null
+++ b/tests/auto/declarative/visual/qdeclarativemouseregion/drag.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle{
+    width:400
+    height:440
+    color: "white"
+    Rectangle{
+        id: draggable
+        width:40; height:40; color: "lightsteelblue"
+            y:20
+        MouseArea{
+            anchors.fill: parent
+            drag.target: draggable
+            drag.axis: "XandYAxis"
+            drag.minimumX: 0
+            drag.maximumX: 360
+            drag.minimumY: 20
+            drag.maximumY: 400
+        }
+    }
+}