Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

10 files changed, 799 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.0.png
new file mode 100644
index 0000000000..74c6934c9a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.qml
new file mode 100644
index 0000000000..e4dbeb1bba
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "justify.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
new file mode 100644
index 0000000000..1b808efd3e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
new file mode 100644
index 0000000000..5485174eb1
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.qml
@@ -0,0 +1,247 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "multilineAlign.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 48
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 64
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 80
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 96
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 112
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 128
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 144
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 160
+        hash: "3fc7ab44f913d350f7aef342b958e56d"
+    }
+    Frame {
+        msec: 176
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 192
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 208
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 224
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 240
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 256
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 272
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 288
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 304
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 320
+        hash: "a495a8a95c8aa82ac437c2f2970bd42d"
+    }
+    Frame {
+        msec: 336
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 352
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 368
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 384
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 400
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 416
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 432
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 448
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 464
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 480
+        hash: "e2d2a6e60537b9a434d0029ef5ff26dc"
+    }
+    Frame {
+        msec: 496
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 512
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 528
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 544
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 560
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 576
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 592
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 608
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 624
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 640
+        hash: "00cba961e67c2124ace75dddb657cd6c"
+    }
+    Frame {
+        msec: 656
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 672
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 688
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 704
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 720
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 736
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 752
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 768
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 784
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 800
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 816
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 832
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 848
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 864
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 880
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 896
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 912
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 928
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 944
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+    Frame {
+        msec: 960
+        hash: "31d518de83e195def2d957b7d86b98e5"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
new file mode 100644
index 0000000000..666d27230f
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml
new file mode 100644
index 0000000000..75e68591c1
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.qml
@@ -0,0 +1,247 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "multilineAlign.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 48
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 64
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 80
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 96
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 112
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 128
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 144
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 160
+        hash: "377fd9e347a2e6e0930d1422ce744c5c"
+    }
+    Frame {
+        msec: 176
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 192
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 208
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 224
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 240
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 256
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 272
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 288
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 304
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 320
+        hash: "36106ba13106d262c02c67e82bba1443"
+    }
+    Frame {
+        msec: 336
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 352
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 368
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 384
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 400
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 416
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 432
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 448
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 464
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 480
+        hash: "509d31a486ae2f83055b52ec12f33e76"
+    }
+    Frame {
+        msec: 496
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 512
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 528
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 544
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 560
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 576
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 592
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 608
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 624
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 640
+        hash: "09b9249750ba637ef659cbc7b9a6055f"
+    }
+    Frame {
+        msec: 656
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 672
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 688
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 704
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 720
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 736
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 752
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 768
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 784
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 800
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 816
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 832
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 848
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 864
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 880
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 896
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 912
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 928
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 944
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+    Frame {
+        msec: 960
+        hash: "1ac7017fcf7c9775b66ed1fb78930a45"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png
new file mode 100644
index 0000000000..e6b2b3cc01
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml
new file mode 100644
index 0000000000..1b43aa36cc
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data/multilineAlign.qml
@@ -0,0 +1,247 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 32
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 48
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 64
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 80
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 96
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 112
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 128
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 144
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 160
+        hash: "1ec47db85ba34bf1900445a2ab87b5e3"
+    }
+    Frame {
+        msec: 176
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 192
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 208
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 224
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 240
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 256
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 272
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 288
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 304
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 320
+        hash: "1fc2a63fa95e277bed60abfdecc7c82f"
+    }
+    Frame {
+        msec: 336
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 352
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 368
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 384
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 400
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 416
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 432
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 448
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 464
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 480
+        hash: "3a4e863d83f5d475e0c8c5121905bd87"
+    }
+    Frame {
+        msec: 496
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 512
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 528
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 544
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 560
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 576
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 592
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 608
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 624
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 640
+        hash: "8887c8f40667f65a814d74b6edcfb81c"
+    }
+    Frame {
+        msec: 656
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 672
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 688
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 704
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 720
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 736
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 752
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 768
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 784
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 800
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 816
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 832
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 848
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 864
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 880
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 896
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 912
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 928
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 944
+        hash: "436000b48f688120d96919227d9e67b4"
+    }
+    Frame {
+        msec: 960
+        image: "multilineAlign.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/justify.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/justify.qml
new file mode 100644
index 0000000000..c3a7aaaf3c
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/justify.qml
@@ -0,0 +1,22 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: 450
+    height: 250
+
+    TestText {
+        anchors.fill: parent
+        anchors { leftMargin: 10; rightMargin: 10; topMargin:10; bottomMargin: 10 }
+        wrapMode: Text.Wrap
+        horizontalAlignment: Text.AlignJustify
+
+        text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin a aliquet massa. Integer id velit a nibh imperdiet sagittis. Cras fringilla enim non nulla porta bibendum. Integer risus urna, hendrerit non interdum ut, dapibus id velit. Nullam fermentum viverra pellentesque. In molestie scelerisque lorem molestie ultrices. Curabitur dolor arcu, tristique in sodales in, varius sed diam. Quisque magna velit, tincidunt sed ullamcorper sit amet, ornare adipiscing ligula. In hac habitasse platea dictumst. Ut tincidunt urna vel mauris fermentum ornare quis a ligula. Suspendisse cursus volutpat sapien eget cursus."
+
+        Rectangle {
+            anchors.fill:  parent
+            color: "transparent"
+            border.color:  "red"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
new file mode 100644
index 0000000000..a427719202
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/multilineAlign.qml
@@ -0,0 +1,25 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+/*Tests both the alignments of multiline text, and that
+  it can deal with changing them properly
+*/
+Item{
+    width: 100
+    height: 80
+    property int stage: 0
+    onStageChanged: if(stage == 6) Qt.quit();
+    TestText{
+        text: "I am the very model of a modern major general."
+        anchors.fill: parent;
+        wrapMode: Text.WordWrap
+        horizontalAlignment: (stage<1 ? Text.AlignRight : (stage<3 ? Text.AlignHCenter : Text.AlignLeft))
+        verticalAlignment: (stage<2 ? Text.AlignBottom : (stage<4 ? Text.AlignVCenter : Text.AlignTop))
+    }
+    Timer{
+        interval: 160
+        running: true
+        repeat: true
+        onTriggered: stage += 1
+    }
+}