Merge remote branch 'origin/4.7' into qt-4.7-from-4.6

Conflicts:
	mkspecs/common/symbian/symbian.conf
	src/3rdparty/webkit/WebCore/WebCore.pro

1 files changed, 331 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
new file mode 100644
index 0000000..64cf2ea
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/repeater/data-MAC/basic2.qml
@@ -0,0 +1,331 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 32
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 48
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 64
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 80
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 96
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 112
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 128
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 144
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 160
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 176
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 192
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 208
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 224
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 240
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 256
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 272
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 288
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 304
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 320
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 336
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 352
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 368
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 384
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 400
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 416
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 432
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 448
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 464
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 480
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 496
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 512
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 528
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 544
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 560
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 576
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 592
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 608
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 624
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 640
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 656
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 672
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 688
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 704
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 720
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 736
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 752
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 768
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 784
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 800
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 816
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 832
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 848
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 864
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 880
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 896
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 912
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 928
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 944
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 960
+        image: "basic2.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 992
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1008
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1024
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1040
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1056
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1072
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1088
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1104
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1120
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1136
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1152
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1168
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1184
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1200
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1216
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1232
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1248
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+    Frame {
+        msec: 1264
+        hash: "2ab8ff9a9fb09111ac07d3966aac9d94"
+    }
+}