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>

6 files changed, 0 insertions, 621 deletions

diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 54ae01faa1..4685657437 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -67,7 +67,6 @@ SOURCES += \
 else:DEFINES *= QT_NO_IMAGEFORMAT_PNG
 
 contains(QT_CONFIG, jpeg):include($$PWD/qjpeghandler.pri)
-contains(QT_CONFIG, mng):include($$PWD/qmnghandler.pri)
 contains(QT_CONFIG, tiff):include($$PWD/qtiffhandler.pri)
 contains(QT_CONFIG, gif):include($$PWD/qgifhandler.pri)
 
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index b089483445..3c770ef140 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -144,9 +144,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
@@ -168,9 +165,6 @@ enum _qt_BuiltInFormatType {
 #ifndef QT_NO_IMAGEFORMAT_JPEG
     _qt_JpgFormat,
 #endif
-#ifndef QT_NO_IMAGEFORMAT_MNG
-    _qt_MngFormat,
-#endif
 #ifndef QT_NO_IMAGEFORMAT_TIFF
     _qt_TifFormat,
 #endif
@@ -206,9 +200,6 @@ static const _qt_BuiltInFormatStruct _qt_BuiltInFormats[] = {
 #ifndef QT_NO_IMAGEFORMAT_JPEG
     {_qt_JpgFormat, "jpg"},
 #endif
-#ifndef QT_NO_IMAGEFORMAT_MNG
-    {_qt_MngFormat, "mng"},
-#endif
 #ifndef QT_NO_IMAGEFORMAT_TIFF
     {_qt_TifFormat, "tif"},
 #endif
@@ -344,10 +335,6 @@ static QImageIOHandler *createReadHandlerHelper(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;
@@ -440,12 +427,6 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
                     handler = new QJpegHandler;
                 break;
 #endif
-#ifndef QT_NO_IMAGEFORMAT_MNG
-            case _qt_MngFormat:
-                if (QMngHandler::canRead(device))
-                    handler = new QMngHandler;
-                break;
-#endif
 #ifndef QT_NO_IMAGEFORMAT_TIFF
             case _qt_TifFormat:
                 if (QTiffHandler::canRead(device))
@@ -1466,7 +1447,6 @@ QByteArray QImageReader::imageFormat(QIODevice *device)
     \row    \o GIF    \o Graphic Interchange Format (optional)
     \row    \o JPG    \o Joint Photographic Experts Group
     \row    \o JPEG   \o Joint Photographic Experts Group
-    \row    \o MNG    \o Multiple-image Network Graphics
     \row    \o PNG    \o Portable Network Graphics
     \row    \o PBM    \o Portable Bitmap
     \row    \o PGM    \o Portable Graymap
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
diff --git a/src/gui/image/qmnghandler.cpp b/src/gui/image/qmnghandler.cpp
deleted file mode 100644
index 435c3120b9..0000000000
--- a/src/gui/image/qmnghandler.cpp
+++ /dev/null
@@ -1,497 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmnghandler_p.h"
-
-#include "qimage.h"
-#include "qvariant.h"
-#include "qcolor.h"
-
-#define MNG_USE_SO
-#include <libmng.h>
-
-QT_BEGIN_NAMESPACE
-
-class QMngHandlerPrivate
-{
-    Q_DECLARE_PUBLIC(QMngHandler)
-    public:
-    bool haveReadNone;
-    bool haveReadAll;
-    mng_handle hMNG;
-    QImage image;
-    int elapsed;
-    int nextDelay;
-    int iterCount;
-    int frameIndex;
-    int nextIndex;
-    int frameCount;
-    mng_uint32 iStyle;
-    mng_bool readData(mng_ptr pBuf, mng_uint32 iSize, mng_uint32p pRead);
-    mng_bool writeData(mng_ptr pBuf, mng_uint32 iSize, mng_uint32p pWritten);
-    mng_bool processHeader(mng_uint32 iWidth, mng_uint32 iHeight);
-    QMngHandlerPrivate(QMngHandler *q_ptr);
-    ~QMngHandlerPrivate();
-    bool getNextImage(QImage *result);
-    bool writeImage(const QImage &image);
-    int currentImageNumber() const;
-    int imageCount() const;
-    bool jumpToImage(int imageNumber);
-    bool jumpToNextImage();
-    int nextImageDelay() const;
-    bool setBackgroundColor(const QColor &color);
-    QColor backgroundColor() const;
-    QMngHandler *q_ptr;
-};
-
-static mng_bool myerror(mng_handle /*hMNG*/,
-    mng_int32   iErrorcode,
-    mng_int8    /*iSeverity*/,
-    mng_chunkid iChunkname,
-    mng_uint32  /*iChunkseq*/,
-    mng_int32   iExtra1,
-    mng_int32   iExtra2,
-    mng_pchar   zErrortext)
-{
-    qWarning("MNG error %d: %s; chunk %c%c%c%c; subcode %d:%d",
-        iErrorcode,zErrortext,
-        (iChunkname>>24)&0xff,
-        (iChunkname>>16)&0xff,
-        (iChunkname>>8)&0xff,
-        (iChunkname>>0)&0xff,
-        iExtra1,iExtra2);
-    return TRUE;
-}
-
-static mng_ptr myalloc(mng_size_t iSize)
-{
-#if defined(Q_OS_WINCE)
-    mng_ptr ptr = malloc(iSize);
-    memset(ptr, 0, iSize);
-    return ptr;
-#else
-    return (mng_ptr)calloc(1, iSize);
-#endif
-}
-
-static void myfree(mng_ptr pPtr, mng_size_t /*iSize*/)
-{
-    free(pPtr);
-}
-
-static mng_bool myopenstream(mng_handle)
-{
-    return MNG_TRUE;
-}
-
-static mng_bool myclosestream(mng_handle hMNG)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    pMydata->haveReadAll = true;
-    return MNG_TRUE;
-}
-
-static mng_bool myreaddata(mng_handle hMNG,
-                    mng_ptr    pBuf,
-                    mng_uint32 iSize,
-                    mng_uint32p pRead)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    return pMydata->readData(pBuf, iSize, pRead);
-}
-
-static mng_bool mywritedata(mng_handle hMNG,
-		     mng_ptr pBuf,
-		     mng_uint32 iSize,
-		     mng_uint32p pWritten)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    return pMydata->writeData(pBuf, iSize, pWritten);
-}
-
-static mng_bool myprocessheader(mng_handle hMNG,
-                                mng_uint32 iWidth,
-                                mng_uint32 iHeight)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    return pMydata->processHeader(iWidth, iHeight);
-}
-
-static mng_ptr mygetcanvasline(mng_handle hMNG,
-			mng_uint32 iLinenr)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    return (mng_ptr)pMydata->image.scanLine(iLinenr);
-}
-
-static mng_bool myrefresh(mng_handle /*hMNG*/,
-                          mng_uint32 /*iX*/,
-                          mng_uint32 /*iY*/,
-                          mng_uint32 /*iWidth*/,
-                          mng_uint32 /*iHeight*/)
-{
-    return MNG_TRUE;
-}
-
-static mng_uint32 mygettickcount(mng_handle hMNG)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    return pMydata->elapsed++;
-}
-
-static mng_bool mysettimer(mng_handle hMNG,
-		    mng_uint32 iMsecs)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    pMydata->elapsed += iMsecs;
-    pMydata->nextDelay = iMsecs;
-    return MNG_TRUE;
-}
-
-static mng_bool myprocessterm(mng_handle hMNG,
-                        mng_uint8   iTermaction,
-                        mng_uint8   /*iIteraction*/,
-                        mng_uint32  /*iDelay*/,
-                        mng_uint32  iItermax)
-{
-    QMngHandlerPrivate *pMydata = reinterpret_cast<QMngHandlerPrivate *>(mng_get_userdata(hMNG));
-    if (iTermaction == 3)
-        pMydata->iterCount = iItermax;
-    return MNG_TRUE;
-}
-
-static mng_bool mytrace(mng_handle,
-                        mng_int32   iFuncnr,
-                        mng_int32   iFuncseq,
-                        mng_pchar   zFuncname)
-{
-    qDebug("mng trace: iFuncnr: %d iFuncseq: %d zFuncname: %s", iFuncnr, iFuncseq, zFuncname);
-    return MNG_TRUE;
-}
-
-QMngHandlerPrivate::QMngHandlerPrivate(QMngHandler *q_ptr)
-    : haveReadNone(true), haveReadAll(false), elapsed(0), nextDelay(0), iterCount(1),
-      frameIndex(-1), nextIndex(0), frameCount(0), q_ptr(q_ptr)
-{
-    iStyle = (QSysInfo::ByteOrder == QSysInfo::LittleEndian) ? MNG_CANVAS_BGRA8 : MNG_CANVAS_ARGB8;
-    // Initialize libmng
-    hMNG = mng_initialize((mng_ptr)this, myalloc, myfree, mytrace);
-    if (hMNG) {
-	// Set callback functions
-        mng_setcb_errorproc(hMNG, myerror);
-        mng_setcb_openstream(hMNG, myopenstream);
-        mng_setcb_closestream(hMNG, myclosestream);
-        mng_setcb_readdata(hMNG, myreaddata);
-        mng_setcb_writedata(hMNG, mywritedata);
-        mng_setcb_processheader(hMNG, myprocessheader);
-        mng_setcb_getcanvasline(hMNG, mygetcanvasline);
-        mng_setcb_refresh(hMNG, myrefresh);
-        mng_setcb_gettickcount(hMNG, mygettickcount);
-        mng_setcb_settimer(hMNG, mysettimer);
-        mng_setcb_processterm(hMNG, myprocessterm);
-        mng_set_doprogressive(hMNG, MNG_FALSE);
-	mng_set_suspensionmode(hMNG, MNG_TRUE);
-    }
-}
-
-QMngHandlerPrivate::~QMngHandlerPrivate()
-{
-    mng_cleanup(&hMNG);
-}
-
-mng_bool QMngHandlerPrivate::readData(mng_ptr pBuf, mng_uint32 iSize, mng_uint32p pRead)
-{
-    Q_Q(QMngHandler);
-    *pRead = q->device()->read((char *)pBuf, iSize);
-    return (*pRead > 0) ? MNG_TRUE : MNG_FALSE;
-}
-
-mng_bool QMngHandlerPrivate::writeData(mng_ptr pBuf, mng_uint32 iSize, mng_uint32p pWritten)
-{
-    Q_Q(QMngHandler);
-    *pWritten = q->device()->write((char *)pBuf, iSize);
-    return MNG_TRUE;
-}
-
-mng_bool QMngHandlerPrivate::processHeader(mng_uint32 iWidth, mng_uint32 iHeight)
-{
-    if (mng_set_canvasstyle(hMNG, iStyle) != MNG_NOERROR)
-        return MNG_FALSE;
-    image = QImage(iWidth, iHeight, QImage::Format_ARGB32);
-    image.fill(0);
-    return MNG_TRUE;
-}
-
-bool QMngHandlerPrivate::getNextImage(QImage *result)
-{
-    mng_retcode ret;
-    if (haveReadNone) {
-        haveReadNone = false;
-        ret = mng_readdisplay(hMNG);
-    } else {
-        ret = mng_display_resume(hMNG);
-    }
-    if ((MNG_NOERROR == ret) || (MNG_NEEDTIMERWAIT == ret)) {
-        *result = image;
-        frameIndex = nextIndex++;
-        if (haveReadAll && (frameCount == 0))
-            frameCount = nextIndex;
-        return true;
-    }
-    return false;
-}
-
-bool QMngHandlerPrivate::writeImage(const QImage &image)
-{
-    mng_reset(hMNG);
-    if (mng_create(hMNG) != MNG_NOERROR)
-	return false;
-
-    this->image = image.convertToFormat(QImage::Format_ARGB32);
-    int w = image.width();
-    int h = image.height();
-
-    if (
-    // width, height, ticks, layercount, framecount, playtime, simplicity
-         (mng_putchunk_mhdr(hMNG, w, h, 1000, 0, 0, 0, 7) == MNG_NOERROR) &&
-    // termination_action, action_after_iterations, delay, iteration_max
-         (mng_putchunk_term(hMNG, 3, 0, 1, 0x7FFFFFFF) == MNG_NOERROR) &&
-    // width, height, bitdepth, colortype, compression, filter, interlace
-         (mng_putchunk_ihdr(hMNG, w, h, 8, 6, 0, 0, 0) == MNG_NOERROR) &&
-    // width, height, colortype, bitdepth, compression, filter, interlace, canvasstyle, getcanvasline
-         (mng_putimgdata_ihdr(hMNG, w, h, 6, 8, 0, 0, 0, iStyle, mygetcanvasline) == MNG_NOERROR) &&
-         (mng_putchunk_iend(hMNG) == MNG_NOERROR) &&
-         (mng_putchunk_mend(hMNG) == MNG_NOERROR) &&
-         (mng_write(hMNG) == MNG_NOERROR)
-        )
-        return true;
-    return false;
-}
-
-int QMngHandlerPrivate::currentImageNumber() const
-{
-//    return mng_get_currentframe(hMNG) % imageCount(); not implemented, apparently
-    return frameIndex;
-}
-
-int QMngHandlerPrivate::imageCount() const
-{
-//    return mng_get_totalframes(hMNG); not implemented, apparently
-    if (haveReadAll)
-        return frameCount;
-    return 0; // Don't know
-}
-
-bool QMngHandlerPrivate::jumpToImage(int imageNumber)
-{
-    if (imageNumber == nextIndex)
-        return true;
-
-    if ((imageNumber == 0) && haveReadAll && (nextIndex == frameCount)) {
-        // Loop!
-        nextIndex = 0;
-        return true;
-    }
-    if (mng_display_freeze(hMNG) == MNG_NOERROR) {
-        if (mng_display_goframe(hMNG, imageNumber) == MNG_NOERROR) {
-            nextIndex = imageNumber;
-            return true;
-        }
-    }
-    return false;
-}
-
-bool QMngHandlerPrivate::jumpToNextImage()
-{
-    return jumpToImage((currentImageNumber()+1) % imageCount());
-}
-
-int QMngHandlerPrivate::nextImageDelay() const
-{
-    return nextDelay;
-}
-
-bool QMngHandlerPrivate::setBackgroundColor(const QColor &color)
-{
-    mng_uint16 iRed = (mng_uint16)(color.red() << 8);
-    mng_uint16 iBlue = (mng_uint16)(color.blue() << 8);
-    mng_uint16 iGreen = (mng_uint16)(color.green() << 8);
-    return (mng_set_bgcolor(hMNG, iRed, iBlue, iGreen) == MNG_NOERROR);
-}
-
-QColor QMngHandlerPrivate::backgroundColor() const
-{
-    mng_uint16 iRed;
-    mng_uint16 iBlue;
-    mng_uint16 iGreen;
-    if (mng_get_bgcolor(hMNG, &iRed, &iBlue, &iGreen) == MNG_NOERROR)
-        return QColor((iRed >> 8) & 0xFF, (iGreen >> 8) & 0xFF, (iBlue >> 8) & 0xFF);
-    return QColor();
-}
-
-QMngHandler::QMngHandler()
-    : d_ptr(new QMngHandlerPrivate(this))
-{
-}
-
-QMngHandler::~QMngHandler()
-{
-}
-
-/*! \reimp */
-bool QMngHandler::canRead() const
-{
-    Q_D(const QMngHandler);
-    if ((!d->haveReadNone
-         && (!d->haveReadAll || (d->haveReadAll && (d->nextIndex < d->frameCount))))
-        || canRead(device()))
-    {
-        setFormat("mng");
-        return true;
-    }
-    return false;
-}
-
-/*! \internal */
-bool QMngHandler::canRead(QIODevice *device)
-{
-    if (!device) {
-        qWarning("QMngHandler::canRead() called with no device");
-        return false;
-    }
-
-    return device->peek(8) == "\x8A\x4D\x4E\x47\x0D\x0A\x1A\x0A";
-}
-
-/*! \reimp */
-QByteArray QMngHandler::name() const
-{
-    return "mng";    
-}
-
-/*! \reimp */
-bool QMngHandler::read(QImage *image)
-{
-    Q_D(QMngHandler);
-    return canRead() ? d->getNextImage(image) : false;
-}
-
-/*! \reimp */
-bool QMngHandler::write(const QImage &image)
-{
-    Q_D(QMngHandler);
-    return d->writeImage(image);
-}
-
-/*! \reimp */
-int QMngHandler::currentImageNumber() const
-{
-    Q_D(const QMngHandler);
-    return d->currentImageNumber();
-}
-
-/*! \reimp */
-int QMngHandler::imageCount() const
-{
-    Q_D(const QMngHandler);
-    return d->imageCount();
-}
-
-/*! \reimp */
-bool QMngHandler::jumpToImage(int imageNumber)
-{
-    Q_D(QMngHandler);
-    return d->jumpToImage(imageNumber);
-}
-
-/*! \reimp */
-bool QMngHandler::jumpToNextImage()
-{
-    Q_D(QMngHandler);
-    return d->jumpToNextImage();
-}
-
-/*! \reimp */
-int QMngHandler::loopCount() const
-{
-    Q_D(const QMngHandler);
-    if (d->iterCount == 0x7FFFFFFF)
-        return -1; // infinite loop
-    return d->iterCount-1;
-}
-
-/*! \reimp */
-int QMngHandler::nextImageDelay() const
-{
-    Q_D(const QMngHandler);
-    return d->nextImageDelay();
-}
-
-/*! \reimp */
-QVariant QMngHandler::option(ImageOption option) const
-{
-    Q_D(const QMngHandler);
-    if (option == QImageIOHandler::Animation)
-        return true;
-    else if (option == QImageIOHandler::BackgroundColor)
-        return d->backgroundColor();
-    return QVariant();
-}
-
-/*! \reimp */
-void QMngHandler::setOption(ImageOption option, const QVariant & value)
-{
-    Q_D(QMngHandler);
-    if (option == QImageIOHandler::BackgroundColor)
-        d->setBackgroundColor(qvariant_cast<QColor>(value));
-}
-
-/*! \reimp */
-bool QMngHandler::supportsOption(ImageOption option) const
-{
-    if (option == QImageIOHandler::Animation)
-        return true;
-    else if (option == QImageIOHandler::BackgroundColor)
-        return true;
-    return false;
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/image/qmnghandler.pri b/src/gui/image/qmnghandler.pri
deleted file mode 100644
index ffb98de92b..0000000000
--- a/src/gui/image/qmnghandler.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-# common to plugin and built-in forms
-INCLUDEPATH *= $$PWD
-HEADERS += $$PWD/qmnghandler_p.h
-SOURCES += $$PWD/qmnghandler.cpp
-contains(QT_CONFIG, system-mng) {
-        if(unix|win32-g++*):LIBS += -lmng
-        else:win32:         LIBS += libmng.lib
-} else {
-    include($$PWD/../../3rdparty/libmng.pri)
-}
diff --git a/src/gui/image/qmnghandler_p.h b/src/gui/image/qmnghandler_p.h
deleted file mode 100644
index 5376acdb3f..0000000000
--- a/src/gui/image/qmnghandler_p.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMNGHANDLER_P_H
-#define QMNGHANDLER_P_H
-
-#include <QtCore/qscopedpointer.h>
-#include <QtGui/qimageiohandler.h>
-
-QT_BEGIN_NAMESPACE
-
-class QImage;
-class QByteArray;
-class QIODevice;
-class QVariant;
-class QMngHandlerPrivate;
-
-class QMngHandler : public QImageIOHandler
-{
-    public:
-    QMngHandler();
-    ~QMngHandler();
-    virtual bool canRead() const;
-    virtual QByteArray name() const;
-    virtual bool read(QImage *image);
-    virtual bool write(const QImage &image);
-    virtual int currentImageNumber() const;
-    virtual int imageCount() const;
-    virtual bool jumpToImage(int imageNumber);
-    virtual bool jumpToNextImage();
-    virtual int loopCount() const;
-    virtual int nextImageDelay() const;
-    static bool canRead(QIODevice *device);
-    virtual QVariant option(ImageOption option) const;
-    virtual void setOption(ImageOption option, const QVariant & value);
-    virtual bool supportsOption(ImageOption option) const;
-
-    private:
-    Q_DECLARE_PRIVATE(QMngHandler)
-    QScopedPointer<QMngHandlerPrivate> d_ptr;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMNGHANDLER_P_H