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 --- config.tests/unix/libmng/libmng.cpp | 54 ------------------------------------- config.tests/unix/libmng/libmng.pro | 4 --- 2 files changed, 58 deletions(-) delete mode 100644 config.tests/unix/libmng/libmng.cpp delete mode 100644 config.tests/unix/libmng/libmng.pro (limited to 'config.tests') diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp deleted file mode 100644 index 8f1c85aa3d..0000000000 --- a/config.tests/unix/libmng/libmng.cpp +++ /dev/null @@ -1,54 +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 config.tests 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 - -int main(int, char **) -{ - mng_handle hMNG; - mng_cleanup(&hMNG); - -#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9) -#error System libmng version is less than 1.0.9; using built-in version instead. -#endif - - return 0; -} diff --git a/config.tests/unix/libmng/libmng.pro b/config.tests/unix/libmng/libmng.pro deleted file mode 100644 index ee57ecd640..0000000000 --- a/config.tests/unix/libmng/libmng.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = libmng.cpp -CONFIG -= qt dylib -mac:CONFIG -= app_bundle -LIBS += -lmng -- cgit v1.2.3