diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:04:59 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-14 14:04:59 +0200 |
| commit | fef13b3b4c1a8af83086ecf49430903778e63624 (patch) | |
| tree | cd7e41f7fae8a642c4023daca773ba40db9e6be1 | |
| parent | 08f40bc0f00716c3a8cbda70ed00dc2f16515e85 (diff) | |
| parent | 338d48cd1a3eb317abe5ecb93964e34de3219144 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I96f7e13e5a6f65dae1a9f7717e30021f81cf1e81
| -rw-r--r-- | tests/auto/webp/images/lena.jpg | bin | 7326 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/webp/images/lena.webp | bin | 2790 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/webp/images/lena_lossless.webp | bin | 9062 -> 0 bytes | |||
| -rw-r--r-- | tests/auto/webp/tst_qwebp.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/webp/webp.qrc | 3 |
5 files changed, 0 insertions, 7 deletions
diff --git a/tests/auto/webp/images/lena.jpg b/tests/auto/webp/images/lena.jpg Binary files differdeleted file mode 100644 index 7add3fc..0000000 --- a/tests/auto/webp/images/lena.jpg +++ /dev/null diff --git a/tests/auto/webp/images/lena.webp b/tests/auto/webp/images/lena.webp Binary files differdeleted file mode 100644 index 4e1d816..0000000 --- a/tests/auto/webp/images/lena.webp +++ /dev/null diff --git a/tests/auto/webp/images/lena_lossless.webp b/tests/auto/webp/images/lena_lossless.webp Binary files differdeleted file mode 100644 index 250f945..0000000 --- a/tests/auto/webp/images/lena_lossless.webp +++ /dev/null diff --git a/tests/auto/webp/tst_qwebp.cpp b/tests/auto/webp/tst_qwebp.cpp index 04e0f4d..73b0fbc 100644 --- a/tests/auto/webp/tst_qwebp.cpp +++ b/tests/auto/webp/tst_qwebp.cpp @@ -50,8 +50,6 @@ void tst_qwebp::readImage_data() QTest::addColumn<QString>("fileName"); QTest::addColumn<QSize>("size"); - QTest::newRow("lena") << QString("lena") << QSize(103, 103); - QTest::newRow("lena_lossless") << QString("lena_lossless") << QSize(103, 103); QTest::newRow("kollada") << QString("kollada") << QSize(436, 160); QTest::newRow("kollada_lossless") << QString("kollada_lossless") << QSize(436, 160); } @@ -77,8 +75,6 @@ void tst_qwebp::writeImage_data() QTest::addColumn<QSize>("size"); QTest::addColumn<bool>("needcheck"); - QTest::newRow("lena-90") << QString("lena") << QString(".jpg") << 90 << QSize(103, 103) << false; - QTest::newRow("lena-100") << QString("lena") << QString(".jpg") << 100 << QSize(103, 103) << false; QTest::newRow("kollada-75") << QString("kollada") << QString(".png") << 75 << QSize(436, 160) << false; QTest::newRow("kollada-100") << QString("kollada") << QString(".png") << 100 << QSize(436, 160) << true; } diff --git a/tests/auto/webp/webp.qrc b/tests/auto/webp/webp.qrc index 6cf0ea0..ab0b1b2 100644 --- a/tests/auto/webp/webp.qrc +++ b/tests/auto/webp/webp.qrc @@ -1,8 +1,5 @@ <RCC> <qresource prefix="/"> - <file>images/lena.jpg</file> - <file>images/lena.webp</file> - <file>images/lena_lossless.webp</file> <file>images/kollada.png</file> <file>images/kollada.webp</file> <file>images/kollada_lossless.webp</file> |
