diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 03:38:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-17 03:38:54 (GMT) |
| commit | 0f8c867b1d5b13a56bd80f1819d4e71a9865b493 (patch) | |
| tree | 0d5b0a5717b925b179680c0c4e176ed9545fe3a8 /tests/auto/declarative/qmlvisual/shared | |
| parent | 13d471d63293b575ab6d5a6bf4abd02a69f07258 (diff) | |
| parent | bccc24cc6cdeb85e9c97d93ba83dd12e85133c35 (diff) | |
| download | Qt-0f8c867b1d5b13a56bd80f1819d4e71a9865b493.zip Qt-0f8c867b1d5b13a56bd80f1819d4e71a9865b493.tar.gz Qt-0f8c867b1d5b13a56bd80f1819d4e71a9865b493.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove pointSize from visual tests
Update visuals for X11
Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
Remove some excess pngs
Update qml visual tests
VisualDataModel::count should be 0 until a valid delegate is set.
Doc: Remove default from PathView path property
Record images on more than just the first frame.
Turn off font antialiasing during tests.
Shrink size of a visual test
Diffstat (limited to 'tests/auto/declarative/qmlvisual/shared')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf | bin | 0 -> 237788 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/shared/TestText.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/shared/TestTextInput.qml | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/shared/Vera.ttf | bin | 65932 -> 0 bytes |
5 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf b/tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf Binary files differnew file mode 100644 index 0000000..029fcac --- /dev/null +++ b/tests/auto/declarative/qmlvisual/shared/DejaVuSansMono.ttf diff --git a/tests/auto/declarative/qmlvisual/shared/TestText.qml b/tests/auto/declarative/qmlvisual/shared/TestText.qml index be40112..ab624c3 100644 --- a/tests/auto/declarative/qmlvisual/shared/TestText.qml +++ b/tests/auto/declarative/qmlvisual/shared/TestText.qml @@ -2,7 +2,7 @@ import QtQuick 1.0 import "../shared" 1.0 Text{ - FontLoader { id: fixedFont; source: "Vera.ttf" } + FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" } font.family: fixedFont.name font.pixelSize: 12 } diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml index e19e418..e7c5bc1 100644 --- a/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml +++ b/tests/auto/declarative/qmlvisual/shared/TestTextEdit.qml @@ -3,7 +3,7 @@ import "../shared" 1.0 TextEdit { id: edit - FontLoader { id: fixedFont; source: "Vera.ttf" } + FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" } font.family: fixedFont.name font.pixelSize: 12 cursorDelegate: Rectangle { diff --git a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml index e01c2c2..64938e0 100644 --- a/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml +++ b/tests/auto/declarative/qmlvisual/shared/TestTextInput.qml @@ -3,7 +3,7 @@ import "../shared" 1.0 TextInput { id: inp - FontLoader { id: fixedFont; source: "Vera.ttf" } + FontLoader { id: fixedFont; source: "DejaVuSansMono.ttf" } font.family: fixedFont.name font.pixelSize: 12 cursorDelegate: Rectangle { diff --git a/tests/auto/declarative/qmlvisual/shared/Vera.ttf b/tests/auto/declarative/qmlvisual/shared/Vera.ttf Binary files differdeleted file mode 100644 index 58cd6b5..0000000 --- a/tests/auto/declarative/qmlvisual/shared/Vera.ttf +++ /dev/null |