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/fillmode | |
| 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/fillmode')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png | bin | 28900 -> 16855 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/fillmode/face.png | bin | 905 -> 1011 bytes | |||
| -rw-r--r-- | tests/auto/declarative/qmlvisual/fillmode/fillmode.qml | 14 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png b/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png Binary files differindex b551e6b..52fd55c 100644 --- a/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png +++ b/tests/auto/declarative/qmlvisual/fillmode/data/fillmode.0.png diff --git a/tests/auto/declarative/qmlvisual/fillmode/face.png b/tests/auto/declarative/qmlvisual/fillmode/face.png Binary files differindex 9623b1a..e087316 100644 --- a/tests/auto/declarative/qmlvisual/fillmode/face.png +++ b/tests/auto/declarative/qmlvisual/fillmode/face.png diff --git a/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml b/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml index 2ac98da..b2ecfee 100644 --- a/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml +++ b/tests/auto/declarative/qmlvisual/fillmode/fillmode.qml @@ -6,16 +6,16 @@ import QtQuick 1.0 */ Rectangle { - id: screen; width: 750; height: 600; color: "gray" + id: screen; width: 360; height: 200; color: "gray" property string source: "face.png" Grid { columns: 3 - Image { width: 250; height: 300; source: screen.source; fillMode: Image.Stretch } - Image { width: 250; height: 300; source: screen.source; fillMode: Image.PreserveAspectFit; smooth: true } - Image { width: 250; height: 300; source: screen.source; fillMode: Image.PreserveAspectCrop } - Image { width: 250; height: 300; source: screen.source; fillMode: Image.Tile; smooth: true } - Image { width: 250; height: 300; source: screen.source; fillMode: Image.TileHorizontally } - Image { width: 250; height: 300; source: screen.source; fillMode: Image.TileVertically } + Image { width: 120; height: 100; source: screen.source; fillMode: Image.Stretch } + Image { width: 120; height: 100; source: screen.source; fillMode: Image.PreserveAspectFit; smooth: true } + Image { width: 120; height: 100; source: screen.source; fillMode: Image.PreserveAspectCrop } + Image { width: 120; height: 100; source: screen.source; fillMode: Image.Tile; smooth: true } + Image { width: 120; height: 100; source: screen.source; fillMode: Image.TileHorizontally } + Image { width: 120; height: 100; source: screen.source; fillMode: Image.TileVertically } } } |
