From 53dbe2c337cb0337d01b38224fd084878175a55c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 2 May 2023 09:11:55 +0200 Subject: Fix use of system png for qtpdf QtPdf has own png library which is controlled by pdfium_use_system_libpng and used by xfa. However skia dependency also pulls root third_party png and we need also use_system_libpng flag set accordingly. Add missing pdfium_use_system_zlib flag too. Fixes: QTBUG-112466 Change-Id: I08b7b32e5fd0ffe08cf77421ff2f0965755304ca Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 7ed48983b0cb5025bd3bde52e57f937894e7fa1d) Reviewed-by: Qt Cherry-pick Bot --- src/pdf/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index 0a039cdd1..e79bbd85e 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -188,6 +188,14 @@ foreach(arch ${archs}) ARGS pdf_enable_xfa_tiff CONDITION QT_FEATURE_pdf_xfa_tiff ) + extend_gn_list(gnArgArg + ARGS pdfium_use_system_zlib + CONDITION QT_FEATURE_webengine_system_zlib + ) + extend_gn_list(gnArgArg + ARGS pdfium_use_system_libpng use_system_libpng + CONDITION QT_FEATURE_webengine_system_libpng + ) extend_gn_list(gnArgArg ARGS pdfium_use_qt_libpng CONDITION QT_FEATURE_webengine_qt_libpng -- cgit v1.2.1