diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-02-26 12:00:04 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-03-01 11:54:26 +0000 |
| commit | f70392700c63d81ef8bcee7351d903e4823b4571 (patch) | |
| tree | fc45835a7be86ca0c959122eb651d4b89f094114 /tests/auto/qmltest | |
| parent | cc71df112772ac5552ca5a698a837f3bbaeddc2a (diff) | |
Fix: Do not read texture files when backend is not opengl
The software backend would assert for the compressed GL texture files.
Autotests updated for this functionality. Moved tests of the optional
texture-file support out of qmltest (where it did not belong) and into
tst_qquickimage, side by side with the tests of the optional svg
format.
Change-Id: I98c407093ccebeb70ba5a93ff0882dbd0b8060d5
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/qmltest')
| -rw-r--r-- | tests/auto/qmltest/image/car.ktx | bin | 11908 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/qmltest/image/logo.pkm | bin | 32784 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/qmltest/image/tst_image.qml | 20 |
3 files changed, 0 insertions, 20 deletions
diff --git a/tests/auto/qmltest/image/car.ktx b/tests/auto/qmltest/image/car.ktx Binary files differdeleted file mode 100644 index 2aefdd306b..0000000000 --- a/tests/auto/qmltest/image/car.ktx +++ /dev/null diff --git a/tests/auto/qmltest/image/logo.pkm b/tests/auto/qmltest/image/logo.pkm Binary files differdeleted file mode 100644 index c0987c5c36..0000000000 --- a/tests/auto/qmltest/image/logo.pkm +++ /dev/null diff --git a/tests/auto/qmltest/image/tst_image.qml b/tests/auto/qmltest/image/tst_image.qml index 346bee6969..f8f0e7b53c 100644 --- a/tests/auto/qmltest/image/tst_image.qml +++ b/tests/auto/qmltest/image/tst_image.qml @@ -122,16 +122,6 @@ Item { fillMode: Image.TileHorizontally } - Image { - id: pkmImage - source: "logo.pkm" - } - - Image { - id: ktxImage - source: "car.ktx" - } - TestCase { name: "Image" @@ -231,15 +221,5 @@ Item { compare(tileModes3.height, 150) compare(tileModes3.fillMode, Image.TileHorizontally) } - - function test_pkmImage() { - compare(pkmImage.width, 256) - compare(pkmImage.height, 256) - } - - function test_ktxImage() { - compare(ktxImage.width, 146) - compare(ktxImage.height, 80) - } } } |