From 48f9ba388b374d56764d9bd9455fda527f6bafba Mon Sep 17 00:00:00 2001
From: aavit <qt_aavit@ovi.com>
Date: Tue, 24 Jan 2012 16:05:02 +0100
Subject: 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>
---
 src/gui/image/qimagewriter.cpp | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src/gui/image/qimagewriter.cpp')

diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 57f6c3e298..13481e404e 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -117,9 +117,6 @@
 #ifndef QT_NO_IMAGEFORMAT_JPEG
 #include <private/qjpeghandler_p.h>
 #endif
-#ifndef QT_NO_IMAGEFORMAT_MNG
-#include <private/qmnghandler_p.h>
-#endif
 #ifndef QT_NO_IMAGEFORMAT_TIFF
 #include <private/qtiffhandler_p.h>
 #endif
@@ -186,10 +183,6 @@ static QImageIOHandler *createWriteHandlerHelper(QIODevice *device,
         } else if (testFormat == "jpg" || testFormat == "jpeg") {
             handler = new QJpegHandler;
 #endif
-#ifndef QT_NO_IMAGEFORMAT_MNG
-        } else if (testFormat == "mng") {
-            handler = new QMngHandler;
-#endif
 #ifndef QT_NO_IMAGEFORMAT_TIFF
         } else if (testFormat == "tif" || testFormat == "tiff") {
             handler = new QTiffHandler;
@@ -705,9 +698,6 @@ QList<QByteArray> QImageWriter::supportedImageFormats()
 #ifndef QT_NO_IMAGEFORMAT_JPEG
     formats << "jpg" << "jpeg";
 #endif
-#ifndef QT_NO_IMAGEFORMAT_MNG
-    formats << "mng";
-#endif
 #ifndef QT_NO_IMAGEFORMAT_TIFF
     formats << "tif" << "tiff";
 #endif
-- 
cgit v1.2.3