From 48f9ba388b374d56764d9bd9455fda527f6bafba Mon Sep 17 00:00:00 2001 From: aavit 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 Reviewed-by: Friedemann Kleint --- src/plugins/imageformats/imageformats.pro | 1 - src/plugins/imageformats/mng/main.cpp | 98 ------------------------------- src/plugins/imageformats/mng/mng.pro | 11 ---- 3 files changed, 110 deletions(-) delete mode 100644 src/plugins/imageformats/mng/main.cpp delete mode 100644 src/plugins/imageformats/mng/mng.pro (limited to 'src/plugins') diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 66dea099aa..bd227c1bfe 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -2,6 +2,5 @@ TEMPLATE = subdirs !contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg !contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif -!contains(QT_CONFIG, no-mng):!contains(QT_CONFIG, mng):SUBDIRS += mng !contains(QT_CONFIG, no-tiff):!contains(QT_CONFIG, tiff):SUBDIRS += tiff !contains(QT_CONFIG, no-ico):SUBDIRS += ico diff --git a/src/plugins/imageformats/mng/main.cpp b/src/plugins/imageformats/mng/main.cpp deleted file mode 100644 index e5e6250680..0000000000 --- a/src/plugins/imageformats/mng/main.cpp +++ /dev/null @@ -1,98 +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 -#include - -#ifndef QT_NO_IMAGEFORMATPLUGIN - -#ifdef QT_NO_IMAGEFORMAT_MNG -#undef QT_NO_IMAGEFORMAT_MNG -#endif -#include - -#include -#include - -QT_BEGIN_NAMESPACE - -class QMngPlugin : public QImageIOPlugin -{ - public: - QStringList keys() const; - Capabilities capabilities(QIODevice *device, const QByteArray &format) const; - QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const; -}; - -QStringList QMngPlugin::keys() const -{ - return QStringList() << QLatin1String("mng"); -} - -QImageIOPlugin::Capabilities QMngPlugin::capabilities(QIODevice *device, const QByteArray &format) const -{ - if (format == "mng") - return Capabilities(CanRead); - if (!format.isEmpty()) - return 0; - if (!device->isOpen()) - return 0; - - Capabilities cap; - if (device->isReadable() && QMngHandler::canRead(device)) - cap |= CanRead; - return cap; -} - -QImageIOHandler *QMngPlugin::create(QIODevice *device, const QByteArray &format) const -{ - QMngHandler *hand = new QMngHandler(); - hand->setDevice(device); - hand->setFormat(format); - return hand; -} - -Q_EXPORT_STATIC_PLUGIN(QMngPlugin) -Q_EXPORT_PLUGIN2(qmng, QMngPlugin) - -QT_END_NAMESPACE - -#endif // !QT_NO_IMAGEFORMATPLUGIN diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro deleted file mode 100644 index ad11c496c7..0000000000 --- a/src/plugins/imageformats/mng/mng.pro +++ /dev/null @@ -1,11 +0,0 @@ -TARGET = qmng -load(qt_plugin) - -QTDIR_build:REQUIRES = "!contains(QT_CONFIG, no-mng)" - -include(../../../gui/image/qmnghandler.pri) -SOURCES += main.cpp - -DESTDIR = $$QT.gui.plugins/imageformats -target.path += $$[QT_INSTALL_PLUGINS]/imageformats -INSTALLS += target -- cgit v1.2.3