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 --- mkspecs/features/qt.prf | 2 +- mkspecs/features/qt_module_config.prf | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index c01f4b612c..2fd24c8ebb 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -61,7 +61,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { DECORATIONPLUGINS = qdecorationdefault qdecorationstyled qdecorationwindows GFXDRIVERPLUGINS = qgfxvnc qscreenvfb qgfxtransformed qgfxshadowfb qgfxpvregl qscreenlinuxfb qeglnullws qdirectfbscreen qahiscreen GRAPHICSSYSTEMPLUGINS = qmeegographicssystem qglgraphicssystem qvggraphicssystem qshivavggraphicssystem - IMAGEPLUGINS = qgif qico qmng qjpeg qsvg qtiff + IMAGEPLUGINS = qgif qico qjpeg qsvg qtiff INPUTPLUGINS = qimsw-multi KBDDRIVERPLUGINS = qlinuxinputkbddriver MOUSEDRIVERPLUGINS = qtslibmousehandler qpcmousedriver qlinuxtpmousedriver diff --git a/mkspecs/features/qt_module_config.prf b/mkspecs/features/qt_module_config.prf index 208ab592e1..4da1666fc5 100644 --- a/mkspecs/features/qt_module_config.prf +++ b/mkspecs/features/qt_module_config.prf @@ -86,8 +86,6 @@ mac { win32:!shared:CONFIG += static win32-borland { - mng:QMAKE_CFLAGS_WARN_ON += -w-par - mng:QMAKE_CXXFLAGS_WARN_ON += -w-par # Keep the size of the .tds file for the Qt library smaller than # 34 Mbytes to avoid linking problems QMAKE_CFLAGS_DEBUG += -vi -y- -- cgit v1.2.3