diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-10-29 08:08:04 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-10-29 08:08:04 (GMT) |
| commit | d58d673c48c1f158fa7d6a59a57671b4305454be (patch) | |
| tree | 5730b0ca132d3732c2ad39e04a6fee3393d64af8 /tests | |
| parent | 2ce656569946f31d0da6b4f5877b69d7afe06d93 (diff) | |
| parent | 5ad00389fd411992b042c07990dd681018f58c36 (diff) | |
| download | Qt-d58d673c48c1f158fa7d6a59a57671b4305454be.zip Qt-d58d673c48c1f158fa7d6a59a57671b4305454be.tar.gz Qt-d58d673c48c1f158fa7d6a59a57671b4305454be.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png | bin | 0 -> 98050 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml | 11 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png | bin | 0 -> 125068 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml | 11 |
4 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png Binary files differnew file mode 100644 index 0000000..6c610ea --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml new file mode 100644 index 0000000..fdf2310 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext.qml @@ -0,0 +1,11 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + image: "plaintext.0.png" + } +} diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png Binary files differnew file mode 100644 index 0000000..c4c56f3 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml new file mode 100644 index 0000000..3da391d --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/richtext.qml @@ -0,0 +1,11 @@ +import Qt.VisualTest 4.7 + +VisualTest { + Frame { + msec: 0 + } + Frame { + msec: 16 + image: "richtext.0.png" + } +} |
