diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-11 09:43:53 +0200 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-10-15 07:18:33 +0000 |
commit | 4783c6dc4441ab833050a08996d40d959960ecff (patch) | |
tree | be41f452117fc01d43298681b5b00ef032d7e0bb /src/plugins | |
parent | 5f1bcf869227ebd3071db9b61a80e81effc38b94 (diff) |
Remove bundled, unmaintained libjasper source codev5.12.0-beta3
[ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been
removed. Building the jp2 handler will require libjasper to be present as
a system or external library.
Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/imageformats/jp2/jp2.pro | 8 | ||||
-rw-r--r-- | src/plugins/imageformats/jp2/qjp2handler.pri | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/plugins/imageformats/jp2/jp2.pro b/src/plugins/imageformats/jp2/jp2.pro index 89b9c55..4caeff3 100644 --- a/src/plugins/imageformats/jp2/jp2.pro +++ b/src/plugins/imageformats/jp2/jp2.pro @@ -1,9 +1,13 @@ TARGET = qjp2 -include(qjp2handler.pri) -SOURCES += main.cpp +HEADERS += qjp2handler_p.h +SOURCES += main.cpp \ + qjp2handler.cpp OTHER_FILES += jp2.json +msvc: LIBS += libjasper.lib +else: LIBS += -ljasper + PLUGIN_TYPE = imageformats PLUGIN_CLASS_NAME = QJp2Plugin load(qt_plugin) diff --git a/src/plugins/imageformats/jp2/qjp2handler.pri b/src/plugins/imageformats/jp2/qjp2handler.pri deleted file mode 100644 index 539daaa..0000000 --- a/src/plugins/imageformats/jp2/qjp2handler.pri +++ /dev/null @@ -1,10 +0,0 @@ -# common to plugin and built-in forms -INCLUDEPATH *= $$PWD -HEADERS += $$PWD/qjp2handler_p.h -SOURCES += $$PWD/qjp2handler.cpp -config_jasper { - msvc: LIBS += libjasper.lib - else: LIBS += -ljasper -} else { - include($$PWD/../../../3rdparty/jasper.pri) -} |