diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-11-19 14:05:10 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-11-25 13:11:11 +0000 |
| commit | 531c30ea66d2b8fe517c89bed149a938e16332ec (patch) | |
| tree | 651252c7583c579bb4368e58aa2c0363aba88de6 | |
| parent | 6a7f3bfcb81b56a29814f50e684620fc3daeb431 (diff) | |
Build MNG and Jpeg2000 plugins only if system libs found
Upstream development libmng and libjasper is mostly stalled,
so security issues are dealt with by the linux distributions
instead. Hence, the stale bundled copy of the 3rd party source code of
those libraries can not be generally recommended.
Leave the bundled versions in the repo for now as a transitional
measure, so that the bundled-lib plugins still can be built manually
(by doing qmake & make in the relevant src/plugins/imageformats
subdirectory). In a later Qt version, the bundled copies of those libs
should be removed.
Change-Id: I651417d91ef0f43cb6abe638f97968576a78e2f0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| -rw-r--r-- | src/3rdparty/jasper.pri | 2 | ||||
| -rw-r--r-- | src/3rdparty/libmng.pri | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/imageformats.pro | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/3rdparty/jasper.pri b/src/3rdparty/jasper.pri index ec9f99f..ddb5c40 100644 --- a/src/3rdparty/jasper.pri +++ b/src/3rdparty/jasper.pri @@ -1,3 +1,5 @@ +warning("Using bundled unmaintained copy of libjasper.") + msvc: DEFINES += JAS_WIN_MSVC_BUILD INCLUDEPATH += $$PWD/jasper/src/libjasper/include $$PWD/libjasper/include SOURCES += \ diff --git a/src/3rdparty/libmng.pri b/src/3rdparty/libmng.pri index 7b68210..95eeed3 100644 --- a/src/3rdparty/libmng.pri +++ b/src/3rdparty/libmng.pri @@ -1,3 +1,5 @@ +warning("Using bundled unmaintained copy of libmng.") + DEFINES += MNG_BUILD_SO DEFINES += MNG_NO_INCLUDE_JNG INCLUDEPATH += $$PWD/libmng diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index 3114367..1ed399a 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -2,13 +2,14 @@ TEMPLATE = subdirs SUBDIRS = \ dds \ icns \ - jp2 \ - mng \ tga \ tiff \ wbmp \ webp +config_jasper: SUBDIRS += jp2 +config_libmng: SUBDIRS += mng + wince:SUBDIRS -= jp2 winrt { |