diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-16 12:21:15 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-03-18 19:32:42 +0000 |
| commit | 5d1ae7dd3b1804fd6d68dc3c25364649eea672a1 (patch) | |
| tree | 94a00c8da7d0943be6f923c0943159afee5782d0 /src/core | |
| parent | d9db469b7d528f95e31d75fb19443c1b2889be76 (diff) | |
Fix unbundling of libpng in pdfium
It is a separate GN setting
Change-Id: I0fdd9c631a0f9dac3cf63cad4c1eb0c4b97786cb
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/linux.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 93ac471d4..68d64fd4f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -123,10 +123,14 @@ host_build { gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\" } - qtConfig(webengine-system-zlib): qtConfig(webengine-system-minizip) { - gn_args += use_system_zlib=true use_system_minizip=true + qtConfig(webengine-system-zlib) { + qtConfig(webengine-system-minizip): gn_args += use_system_zlib=true use_system_minizip=true qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_zlib=true } + qtConfig(webengine-system-png) { + gn_args += use_system_libpng=true + qtConfig(webengine-printing-and-pdf): gn_args += pdfium_use_system_libpng=true + } qtConfig(webengine-system-png): gn_args += use_system_libpng=true qtConfig(webengine-system-jpeg): gn_args += use_system_libjpeg=true qtConfig(system-freetype): gn_args += use_system_freetype=true |