5 files changed, 166 insertions, 34 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.0.png
new file mode 100644
index 0000000000..1fd0213767
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
new file mode 100644
index 0000000000..c5a5a7619a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-MAC/parentanchor.qml
@@ -0,0 +1,131 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "parentanchor.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 48
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 64
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 80
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 96
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 112
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 128
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 144
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 160
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 176
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 192
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 208
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 224
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 240
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 256
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 272
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 288
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 304
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 320
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 336
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 352
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 368
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 384
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 400
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 416
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 432
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 448
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 464
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 480
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+    Frame {
+        msec: 496
+        hash: "f45eda9414f7db5ed1f97a8275459abd"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
new file mode 100644
index 0000000000..d85498b455
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
index 880609b674..26cd97b590 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.qml
@@ -6,126 +6,126 @@ VisualTest {
     }
     Frame {
         msec: 16
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        image: "parentanchor.0.png"
     }
     Frame {
         msec: 32
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 48
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 64
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 80
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 96
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 112
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 128
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 144
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 160
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 176
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 192
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 208
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 224
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 240
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 256
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 272
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 288
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 304
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 320
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 336
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 352
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 368
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 384
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 400
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 416
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 432
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 448
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 464
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 480
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
     Frame {
         msec: 496
-        hash: "3e022a120a2dbe688d53657508de36cf"
+        hash: "8e36621abce059cb8579dd04b28e8d58"
     }
 }
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
index ec1f8b34da..618a65f063 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/parentanchor.qml
@@ -1,13 +1,14 @@
 import QtQuick 1.0
+import "../../shared" 1.0
 
 Rectangle {
-    id: s; width: 600; height: 100; color: "lightsteelblue"
+    id: s; width: 600; height: 100;
     property string text: "The quick brown fox jumps over the lazy dog."
-    Text {
+    TestText {
         text: s.text
         anchors.verticalCenter: s.verticalCenter
     }
-    Text {
+    TestText {
         text: s.text
         anchors.baseline: s.verticalCenter
     }