diff options
author | Michal Klocek <michal.klocek@qt.io> | 2019-08-26 15:28:33 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2019-09-03 17:30:08 +0200 |
commit | 5ff6ecf1cabcc93700d7997c2e22e14a84743d33 (patch) | |
tree | 4154994b1b2b958b6c2415de1f1b374fd8766ac5 /src | |
parent | 81d103b44d620c4c170c7a80e06149b5011753fb (diff) |
Fix broken jpeg includes
In Chromium 67 use of system jpeg is by default.
Fix our configure.
Fixes: QTBUG-77827
Change-Id: I6319f0fab9983d63c733a9723847ad793141e073
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/config/linux.pri | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index c536b2555..22cb5991f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -163,9 +163,21 @@ host_build { gn_args += use_system_libpng=true qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_libpng=true } - qtConfig(webengine-system-jpeg): gn_args += use_system_libjpeg=true - qtConfig(webengine-system-freetype): gn_args += use_system_freetype=true - qtConfig(webengine-system-harfbuzz): gn_args += use_system_harfbuzz=true + qtConfig(webengine-system-jpeg) { + gn_args += use_system_libjpeg=true + } else { + gn_args += use_system_libjpeg=false + } + qtConfig(webengine-system-freetype) { + gn_args += use_system_freetype=true + } else { + gn_args += use_system_freetype=false + } + qtConfig(webengine-system-harfbuzz) { + gn_args += use_system_harfbuzz=true + } else { + gn_args += use_system_harfbuzz=false + } !qtConfig(webengine-system-glib): gn_args += use_glib=false qtConfig(webengine-pulseaudio) { gn_args += use_pulseaudio=true |