Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

11 files changed, 1573 insertions, 1 deletions

diff --git a/src/declarative/util/qmlpropertychanges.cpp b/src/declarative/util/qmlpropertychanges.cpp
index dbf2bc4..3cc6ca9 100644
--- a/src/declarative/util/qmlpropertychanges.cpp
+++ b/src/declarative/util/qmlpropertychanges.cpp
@@ -307,7 +307,7 @@ QmlPropertyChangesPrivate::property(const QByteArray &property)
     if (!prop.isValid()) {
         qmlInfo(QmlPropertyChanges::tr("Cannot assign to non-existant property \"%1\"").arg(QString::fromUtf8(property)), q);
         return QmlMetaProperty();
-    } else if (!prop.isWritable()) {
+    } else if (prop.type() != QmlMetaProperty::SignalProperty && !prop.isWritable()) {
         qmlInfo(QmlPropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property)), q);
         return QmlMetaProperty();
     }
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png
new file mode 100644
index 0000000..50d56dc
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
new file mode 100644
index 0000000..63e20d4
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/plaintext.qml
@@ -0,0 +1,351 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 32
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 48
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 64
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 80
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 96
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 112
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 128
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 144
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 160
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 176
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 192
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 208
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 224
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 240
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 256
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 272
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 288
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 304
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 320
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 336
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 352
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 368
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 384
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 400
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 416
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 432
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 448
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 464
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 480
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 496
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 512
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 528
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 544
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 560
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 576
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 592
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 608
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 624
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 640
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 656
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 672
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 688
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 704
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 720
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 736
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 752
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 768
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 784
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 800
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 816
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 832
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 848
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 864
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 880
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 896
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 912
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 928
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 944
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 960
+        image: "plaintext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 992
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1008
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1024
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1040
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1056
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1072
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1088
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1104
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1120
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1136
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1152
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1168
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1184
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1216
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1232
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1248
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1264
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1280
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1296
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1312
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1328
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1344
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png
new file mode 100644
index 0000000..2910670
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
new file mode 100644
index 0000000..d55ad90
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data-MAC/richtext.qml
@@ -0,0 +1,359 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 32
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 48
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 64
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 80
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 96
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 112
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 128
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 144
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 160
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 176
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 192
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 208
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 224
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 240
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 256
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 272
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 288
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 304
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 320
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 336
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 352
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 368
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 384
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 400
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 416
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 432
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 448
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 464
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 480
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 496
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 512
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 528
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 544
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 560
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 576
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 592
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 608
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 624
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 640
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 656
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 672
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 688
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 704
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 720
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 736
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 752
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 768
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 784
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 800
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 816
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 832
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 848
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 864
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 880
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 896
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 912
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 928
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 944
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 960
+        image: "richtext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 992
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1008
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1024
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1040
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1056
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1072
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1088
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1104
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1120
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1136
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1152
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 0
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1184
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1200
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1216
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1232
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1248
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1264
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1280
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1296
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1312
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1328
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1344
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1360
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1376
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png b/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png
new file mode 100644
index 0000000..50d56dc
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data/plaintext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml
new file mode 100644
index 0000000..f4cbcbd
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data/plaintext.qml
@@ -0,0 +1,351 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 32
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 48
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 64
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 80
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 96
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 112
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 128
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 144
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 160
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 176
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 192
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 208
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 224
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 240
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 256
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 272
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 288
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 304
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 320
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 336
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 352
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 368
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 384
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 400
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 416
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 432
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 448
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 464
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 480
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 496
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 512
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 528
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 544
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 560
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 576
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 592
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 608
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 624
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 640
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 656
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 672
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 688
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 704
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 720
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 736
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 752
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 768
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 784
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 800
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 816
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 832
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 848
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 864
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 880
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 896
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 912
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 928
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 944
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 960
+        image: "plaintext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 992
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1008
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1024
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1040
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1056
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1072
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1088
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1104
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1120
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1136
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1152
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1168
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1184
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1200
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1216
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1232
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1248
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1264
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1280
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1296
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1312
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1328
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+    Frame {
+        msec: 1344
+        hash: "d553014bc56a46787e30459b0f44f57a"
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png b/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png
new file mode 100644
index 0000000..2910670
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data/richtext.0.png
diff --git a/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml
new file mode 100644
index 0000000..9f396c2
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/data/richtext.qml
@@ -0,0 +1,359 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 32
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 48
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 64
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 80
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 96
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 112
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 128
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 144
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 160
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 176
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 192
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 208
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 224
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 240
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 256
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 272
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 288
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 304
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 320
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 336
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 352
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 368
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 384
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 400
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 416
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 432
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 448
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 464
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 480
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 496
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 512
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 528
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 544
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 560
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 576
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 592
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 608
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 624
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 640
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 656
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 672
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 688
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 704
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 720
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 736
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 752
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 768
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 784
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 800
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 816
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 832
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 848
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 864
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 880
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 896
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 912
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 928
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 944
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 960
+        image: "richtext.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 992
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1008
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1024
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1040
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1056
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1072
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1088
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1104
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1120
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1136
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1152
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Key {
+        type: 6
+        key: 16777249
+        modifiers: 67108864
+        text: ""
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1168
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1184
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1200
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1216
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1232
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1248
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1264
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1280
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1296
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1312
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1328
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1344
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1360
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+    Frame {
+        msec: 1376
+        hash: "dfea78484b840b8cab690e277b960723"
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/plaintext.qml b/tests/auto/declarative/visual/qfxtext/font/plaintext.qml
new file mode 100644
index 0000000..c58b95c
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/plaintext.qml
@@ -0,0 +1,76 @@
+import Qt 4.6
+
+Rectangle {
+    id: s; width: 800; height: 800; color: "lightsteelblue"
+    property string text: "The quick brown fox jumps over the lazy dog."
+
+    Column {
+        spacing: 10
+        Text {
+            text: s.text
+        }
+        Text {
+            text: s.text; font.pixelSize: 18
+        }
+        Text {
+            text: s.text; font.pointSize: 25
+        }
+        Text {
+            text: s.text; color: "red"
+        }
+        Text {
+            text: s.text; font.capitalization: "AllUppercase"
+        }
+        Text {
+            text: s.text; font.underline: true
+        }
+        Text {
+            text: s.text; font.overline: true
+        }
+        Text {
+            text: s.text; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.letterSpacing: 200
+        }
+        Text {
+            text: s.text; font.underline: true; font.letterSpacing: 200; font.capitalization: "AllUppercase"; color: "blue"
+        }
+        Text {
+            text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignHCenter; width: 800
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignRight; width: 800
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/qfxtext/font/richtext.qml b/tests/auto/declarative/visual/qfxtext/font/richtext.qml
new file mode 100644
index 0000000..390527a
--- /dev/null
+++ b/tests/auto/declarative/visual/qfxtext/font/richtext.qml
@@ -0,0 +1,76 @@
+import Qt 4.6
+
+Rectangle {
+    id: s; width: 800; height: 800; color: "lightsteelblue"
+    property string text: "<b>The</b> <i>quick</i> <u>brown</u> <o>fox</o> <big>jumps</big> <small>over</small> <tt>the</tt> <s>lazy</s> <em>dog</em>."
+
+    Column {
+        spacing: 10
+        Text {
+            text: s.text
+        }
+        Text {
+            text: s.text; font.pixelSize: 18
+        }
+        Text {
+            text: s.text; font.pointSize: 25
+        }
+        Text {
+            text: s.text; color: "red"
+        }
+        Text {
+            text: s.text; font.capitalization: "AllUppercase"
+        }
+        Text {
+            text: s.text; font.underline: true
+        }
+        Text {
+            text: s.text; font.overline: true
+        }
+        Text {
+            text: s.text; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.underline: true; font.overline: true; font.strikeout: true
+        }
+        Text {
+            text: s.text; font.letterSpacing: 200
+        }
+        Text {
+            text: s.text; font.underline: true; font.letterSpacing: 200; font.capitalization: "AllUppercase"; color: "blue"
+        }
+        Text {
+            text: s.text; font.overline: true; font.wordSpacing: 25; font.capitalization: "Capitalize"; color: "green"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Sunken; styleColor: "gray"
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Raised; styleColor: "yellow"
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignLeft; width: 800
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignHCenter; width: 800
+        }
+        Text {
+            text: s.text; horizontalAlignment: Text.AlignRight; width: 800
+        }
+        Text {
+            text: s.text; font.pixelSize: 18; style: Text.Outline; styleColor: "white"; wrap: true; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideLeft; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideMiddle; width: 200
+        }
+        Text {
+            text: s.text; elide: Text.ElideRight; width: 200
+        }
+    }
+}