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

Conflicts:
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-html-templates.qdocconf
	tools/qdoc3/test/qt.qdocconf

2 files changed, 208 insertions, 1 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.qml
index 520d9a2..d2d46e4 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test-flipable.qml
@@ -1,4 +1,4 @@
-import Qt.VisualTest 4.6
+import Qt.VisualTest 4.7
 
 VisualTest {
     Frame {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test_flipable_resize.qml b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test_flipable_resize.qml
new file mode 100644
index 0000000..d1a5ade
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativeflipable/data/test_flipable_resize.qml
@@ -0,0 +1,207 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "04382a80a203e1fe3d0d4944c9195e0b"
+    }
+    Frame {
+        msec: 32
+        hash: "8d8c6a3c37ba3cb77afcc7ed4234d40f"
+    }
+    Frame {
+        msec: 48
+        hash: "93ab01494e2229c0921c25d3acbcffe6"
+    }
+    Frame {
+        msec: 64
+        hash: "5036bf3c842e5ad09b7bac5512e433ad"
+    }
+    Frame {
+        msec: 80
+        hash: "ef02ef4598fbe6390391b7f2c17ec99d"
+    }
+    Frame {
+        msec: 96
+        hash: "7fa83afca86cfec48a4986ba3df08e3b"
+    }
+    Frame {
+        msec: 112
+        hash: "d9388827bd7755bb9bc1ef78507cc0ac"
+    }
+    Frame {
+        msec: 128
+        hash: "d18778f4f748f7ee54404db334831ff7"
+    }
+    Frame {
+        msec: 144
+        hash: "fee69ae3b4d79b795d4443b055a8a91a"
+    }
+    Frame {
+        msec: 160
+        hash: "f80fa0131c859286e900071b51e74784"
+    }
+    Frame {
+        msec: 176
+        hash: "b654e51ea71ec118e6b985743281b6a1"
+    }
+    Frame {
+        msec: 192
+        hash: "91c771226e9c97e0f00c6f7c6fc6c95c"
+    }
+    Frame {
+        msec: 208
+        hash: "0f612f81541b093442e68d99e00c288c"
+    }
+    Frame {
+        msec: 224
+        hash: "246b619598606fef9f0442439cee4ec6"
+    }
+    Frame {
+        msec: 240
+        hash: "1d2f34459b2128877218cef340f46f06"
+    }
+    Frame {
+        msec: 256
+        hash: "af3c2eef734da05d45484bbb19646425"
+    }
+    Frame {
+        msec: 272
+        hash: "85dfe5680e47919500728de6e93c8290"
+    }
+    Frame {
+        msec: 288
+        hash: "8fd7d439bafa07461a65a3c97cf8602a"
+    }
+    Frame {
+        msec: 304
+        hash: "1ebf543a84aae4abfd480f24ad362cb0"
+    }
+    Frame {
+        msec: 320
+        hash: "60a9c9300981282986659e7c73d381b0"
+    }
+    Frame {
+        msec: 336
+        hash: "686f3ff048f2b214033988d989ed087a"
+    }
+    Frame {
+        msec: 352
+        hash: "24694e17476b0ffe9848159aa282e931"
+    }
+    Frame {
+        msec: 368
+        hash: "c05e1bdf62e3e58972f868b930823a58"
+    }
+    Frame {
+        msec: 384
+        hash: "cbc1a3c78b8f79047d1221d5ae06f0f8"
+    }
+    Frame {
+        msec: 400
+        hash: "05ad366e74bf30b1619cf2ef1f530d82"
+    }
+    Frame {
+        msec: 416
+        hash: "4c5c536f2c03ecfb7d3d8f56638001ec"
+    }
+    Frame {
+        msec: 432
+        hash: "9754048ffcb7863a8a676e5bee4a7991"
+    }
+    Frame {
+        msec: 448
+        hash: "047aa8203ad18023f5af340a41f1084e"
+    }
+    Frame {
+        msec: 464
+        hash: "1351b7c92cd873db387e93dc74cca848"
+    }
+    Frame {
+        msec: 480
+        hash: "4066f52fae753013396195dc98311058"
+    }
+    Frame {
+        msec: 496
+        hash: "21d969b92993e428e79babb574e9203d"
+    }
+    Frame {
+        msec: 512
+        hash: "62c00f52e8b0592fbb59f88deb3b022e"
+    }
+    Frame {
+        msec: 528
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 544
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 560
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 576
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 592
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 608
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 624
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 640
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 656
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 672
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 688
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 704
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 720
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 736
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 752
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+    Frame {
+        msec: 768
+        hash: "322719dee40d3495e9b4d2faac351e89"
+    }
+}