diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-06-07 01:39:41 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-06-07 01:59:28 +0300 |
| commit | ac794c7928225108f27bbad161682c74756da8fb (patch) | |
| tree | b12735eaaad587a3e41be80b577850f87f0430a7 /WebKit.pro | |
| parent | 154b95c308911b04f11a991b5ac792269f89ab7d (diff) | |
| download | qtwebkit-ac794c7928225108f27bbad161682c74756da8fb.tar.gz | |
Stop using bundled libjpeg from qtbase
[*] Its usage is too fragile, updates on QtBase side often break compilation,
also maintaining compatibility with different Qt versions becomes harder
[*] Mismatch between vendor and version of libjpeg bundled with QtBase is the often
sources of troubles for Windows and macOS users trying to build QtWebKit
from sources against precompiled Qt SDK.
This patch makes libjpeg optional dependency when CMake option USE_LIBJPEG is set to
off. In qmake wrapper detection of bunled libjpeg in QtGui configuration disables
use of libjpeg automatically. When WebKit JPEG decoder is disabled, JPEG images are
handled by QImageReader, losing support for progressive rendering and possibly some
other features.
Note that libpng is still mandatory, because it doesn't expose issues
described above.
Change-Id: Ibf270f2f9e3230b27f4c63390918dd7e78ffee2b
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'WebKit.pro')
| -rw-r--r-- | WebKit.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebKit.pro b/WebKit.pro index ca3b009aa..09debf182 100644 --- a/WebKit.pro +++ b/WebKit.pro @@ -9,9 +9,6 @@ isPlatformSupported() { !qtConfig(system-png):qtConfig(png):exists($$QTBASE_DIR): \ SUBDIRS += $$PROJECTS_DIR/qtpng - !qtConfig(system-jpeg):exists($$QTBASE_DIR): \ - SUBDIRS += $$PROJECTS_DIR/qtjpeg - SUBDIRS += \ $$PROJECTS_DIR/generate_cmake_toolchain_file.pro \ $$PROJECTS_DIR/generate_forwarding_pris.pro \ |