From 5d1ae7dd3b1804fd6d68dc3c25364649eea672a1 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 16 Mar 2018 12:21:15 +0100 Subject: Fix unbundling of libpng in pdfium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is a separate GN setting Change-Id: I0fdd9c631a0f9dac3cf63cad4c1eb0c4b97786cb Reviewed-by: Michael Brüning --- src/core/config/linux.pri | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/core') 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 -- cgit v1.2.3