diff options
author | aavit <qt_aavit@ovi.com> | 2012-01-24 16:05:02 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 02:22:18 +0100 |
commit | 48f9ba388b374d56764d9bd9455fda527f6bafba (patch) | |
tree | 3da4940606741fc994128bf35d08c81957215135 /tests/benchmarks/gui/image | |
parent | c0d30db45ca0af9c3010097d8cd8b1ae92cf83ea (diff) | |
download | qtbase-48f9ba388b374d56764d9bd9455fda527f6bafba.tar.gz |
Remove support for the MNG file format and the bundled libmng
The MNG file format is generally abandoned, and libmng has been
unmaintained for several years.
The MNG plugin and bundled libmng has been moved to the
qtimageformats project on Gerrit.
Task-number: QTBUG-21869
Change-Id: I946432347014ffde2b72307a5f8b166ca5553602
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/benchmarks/gui/image')
-rw-r--r-- | tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro | 1 | ||||
-rw-r--r-- | tests/benchmarks/gui/image/qimagereader/images/ball.mng | bin | 34394 -> 0 bytes | |||
-rw-r--r-- | tests/benchmarks/gui/image/qimagereader/images/corrupt.mng | bin | 183 -> 0 bytes | |||
-rw-r--r-- | tests/benchmarks/gui/image/qimagereader/images/fire.mng | bin | 44430 -> 0 bytes | |||
-rw-r--r-- | tests/benchmarks/gui/image/qimagereader/qimagereader.pro | 1 | ||||
-rw-r--r-- | tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp | 4 |
6 files changed, 0 insertions, 6 deletions
diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index 7b3ba93737..e04026bb7f 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -5,5 +5,4 @@ SOURCES += tst_qimageconversion.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF diff --git a/tests/benchmarks/gui/image/qimagereader/images/ball.mng b/tests/benchmarks/gui/image/qimagereader/images/ball.mng Binary files differdeleted file mode 100644 index 81544780fd..0000000000 --- a/tests/benchmarks/gui/image/qimagereader/images/ball.mng +++ /dev/null diff --git a/tests/benchmarks/gui/image/qimagereader/images/corrupt.mng b/tests/benchmarks/gui/image/qimagereader/images/corrupt.mng Binary files differdeleted file mode 100644 index 17fd43a5ca..0000000000 --- a/tests/benchmarks/gui/image/qimagereader/images/corrupt.mng +++ /dev/null diff --git a/tests/benchmarks/gui/image/qimagereader/images/fire.mng b/tests/benchmarks/gui/image/qimagereader/images/fire.mng Binary files differdeleted file mode 100644 index c6695c8369..0000000000 --- a/tests/benchmarks/gui/image/qimagereader/images/fire.mng +++ /dev/null diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index 311ffad009..8e5faca575 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -7,7 +7,6 @@ SOURCES += tst_qimagereader.cpp !contains(QT_CONFIG, no-gif):DEFINES += QTEST_HAVE_GIF !contains(QT_CONFIG, no-jpeg):DEFINES += QTEST_HAVE_JPEG -!contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF QT += network diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp index a14f3b6bf6..7a05712f46 100644 --- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp @@ -117,10 +117,6 @@ tst_QImageReader::tst_QImageReader() images << QPair<QString, QByteArray>(QLatin1String("earth.gif"), QByteArray("gif")); images << QPair<QString, QByteArray>(QLatin1String("trolltech.gif"), QByteArray("gif")); #endif -#if defined QTEST_HAVE_MNG - images << QPair<QString, QByteArray>(QLatin1String("ball.mng"), QByteArray("mng")); - images << QPair<QString, QByteArray>(QLatin1String("fire.mng"), QByteArray("mng")); -#endif } tst_QImageReader::~tst_QImageReader() |