diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-10 15:23:51 +0200 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-12 13:17:11 +0000 |
commit | 3e081dbc87eb3872197f56ddea8f55edf9c8aa3b (patch) | |
tree | 9c392097e16e7a3094c47ed6c74af85d697f8f51 /src/plugins/imageformats/mng | |
parent | ceebd297c3e4365940469347208e5f22b764d6a3 (diff) |
Remove bundled, unmaintained libmng source codev5.12.0-beta2
[ChangeLog][Third-Party Code] The unmaintained bundled libmng has been
removed. Building the mng handler will require libmng to be present as
a system or external library.
Change-Id: I4a4805fa3f3088b5d581b92bfeabba7978bac5f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins/imageformats/mng')
-rw-r--r-- | src/plugins/imageformats/mng/mng.pro | 8 | ||||
-rw-r--r-- | src/plugins/imageformats/mng/qmnghandler.pri | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index cd233c8..4641110 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -1,9 +1,13 @@ TARGET = qmng -include(qmnghandler.pri) -SOURCES += main.cpp +HEADERS += qmnghandler_p.h +SOURCES += main.cpp \ + qmnghandler.cpp OTHER_FILES += mng.json +msvc: LIBS += libmng.lib +else: LIBS += -lmng + PLUGIN_TYPE = imageformats PLUGIN_CLASS_NAME = QMngPlugin load(qt_plugin) diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri deleted file mode 100644 index 5c0fff1..0000000 --- a/src/plugins/imageformats/mng/qmnghandler.pri +++ /dev/null @@ -1,11 +0,0 @@ -# common to plugin and built-in forms -INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qmnghandler_p.h -SOURCES += $$PWD/qmnghandler.cpp -config_libmng { - unix|mingw: LIBS += -lmng - else:win32: LIBS += libmng.lib -} else { - include($$PWD/../../../3rdparty/libmng.pri) - *-g++*: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -} |