11 files changed, 930 insertions, 4 deletions
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 3921d3e..daf2ae1 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -173,7 +173,11 @@ component. Each instance runs a NumberAnimation, and when the animation has fini
 Alternatively, the \c application.qml could have destroyed the created object
 by calling \c object.destroy().
 
-Notice that if a \c SelfDestroyingRect instance was created statically like this:
+Note that it is safe to call destroy() on an object within that object. Objects are not destroyed the
+instant destroy() is called, but are cleaned up sometime between the end of that script block and the next frame
+(unless you specified a non-zero delay).
+
+Note also that if a \c SelfDestroyingRect instance was created statically like this:
 
 \qml
 Item {
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
index e5c55a4..a688563 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.qml
@@ -450,7 +450,7 @@ VisualTest {
     }
     Frame {
         msec: 1760
-        hash: "2c01571e523002166ba6ec476bc8a68b"
+        hash: "b2b4b3de77e2b7fd58d3da1ad52355a9"
     }
     Frame {
         msec: 1776
@@ -1554,7 +1554,7 @@ VisualTest {
     }
     Frame {
         msec: 6144
-        hash: "0506667a14ace4e2edf04956c137e217"
+        hash: "8cd5edce652013a2ed4bf95693259538"
     }
     Frame {
         msec: 6160
@@ -1731,7 +1731,7 @@ VisualTest {
     Key {
         type: 6
         key: 16777249
-        modifiers: 0
+        modifiers: 67108864
         text: ""
         autorep: false
         count: 1
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
new file mode 100644
index 0000000..a4bae3a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml
new file mode 100644
index 0000000..a470a66
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.qml
@@ -0,0 +1,447 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 32
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 48
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 64
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 80
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 96
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 112
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 128
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 144
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 160
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 176
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 192
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 208
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 224
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 240
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 256
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 272
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 288
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 304
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 320
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 336
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 352
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 368
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 384
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 400
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 416
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 432
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 448
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 464
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 480
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 496
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 512
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 528
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 544
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 560
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 576
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 592
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 608
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 624
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 640
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 656
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 672
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 688
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 704
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 720
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 736
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 752
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 768
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 784
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 800
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 816
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 832
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 848
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 864
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 880
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 896
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 912
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 928
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 944
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug_14865.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 992
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1008
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1024
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1040
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1056
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1072
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1088
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1104
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1120
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1136
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1152
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1168
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1184
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1200
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1216
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1232
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1248
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1264
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1280
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1296
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1312
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1328
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1344
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1360
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1376
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1392
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1408
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1424
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1440
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1456
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1472
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1488
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1504
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1520
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1536
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1552
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1568
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1584
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1600
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1616
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1632
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1648
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1664
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1680
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1696
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1712
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1728
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1744
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1760
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png
new file mode 100644
index 0000000..a4bae3a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml
new file mode 100644
index 0000000..a470a66
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/data/qtbug_14865.qml
@@ -0,0 +1,447 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 32
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 48
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 64
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 80
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 96
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 112
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 128
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 144
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 160
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 176
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 192
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 208
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 224
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 240
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 256
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 272
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 288
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 304
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 320
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 336
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 352
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 368
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 384
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 400
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 416
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 432
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 448
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 464
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 480
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 496
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 512
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 528
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 544
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 560
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 576
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 592
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 608
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 624
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 640
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 656
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 672
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 688
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 704
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 720
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 736
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 752
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 768
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 784
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 800
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 816
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 832
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 848
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 864
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 880
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 896
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 912
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 928
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 944
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 960
+        image: "qtbug_14865.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 992
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1008
+        hash: "fd4d35de0a95388dd92ffbb82fbe0e8a"
+    }
+    Frame {
+        msec: 1024
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1040
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1056
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1072
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1088
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1104
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1120
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1136
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1152
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1168
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1184
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1200
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1216
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1232
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1248
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1264
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1280
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1296
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1312
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1328
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1344
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1360
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1376
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1392
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1408
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1424
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1440
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1456
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1472
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1488
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1504
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1520
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1536
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1552
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1568
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1584
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1600
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1616
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1632
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1648
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1664
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1680
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1696
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1712
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1728
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1744
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+    Frame {
+        msec: 1760
+        hash: "eee4600ac08b458ac7ac2320e225674c"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
new file mode 100644
index 0000000..0574f63
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml
new file mode 100644
index 0000000..f6cddc4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext2.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png
new file mode 100644
index 0000000..0574f63
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml
new file mode 100644
index 0000000..f6cddc4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data/plaintext2.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "plaintext2.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
index b52b430..81404ea 100644
--- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
+++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp
@@ -345,6 +345,12 @@ void usage()
         "If you ONLY wish to use the 'error' property, you can record your test with\n"
         "-recordnovisuals, or discard existing visuals with -removevisuals; the test\n"
         "will then only fail on a syntax error, crash, or non-empty 'error' property.\n"
+        "\n"
+        "If your test has anything set to the 'skip' property on the root object then\n"
+        "test failures will be ignored. This allows for an opt-out of automated\n"
+        "aggregation of test results. The value of the 'skip' property (usually a\n"
+        "string) will then be printed to stdout when the test is run as part of the\n"
+        "message saying the test has been skipped.\n"
     );
 }