summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2023-05-02 09:11:55 +0200
committerMichal Klocek <michal.klocek@qt.io>2023-05-16 13:29:32 +0200
commit7ed48983b0cb5025bd3bde52e57f937894e7fa1d (patch)
tree9a39ce2678c52793e6a71922d7e5588337cbfd8e
parent79b4a45bb702420f6e90da98212a4a99920ce669 (diff)
downloadqtwebengine-7ed48983b0cb5025bd3bde52e57f937894e7fa1d.tar.gz
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 Pick-to: 6.5 Change-Id: I08b7b32e5fd0ffe08cf77421ff2f0965755304ca Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/pdf/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt
index 0ee05def2..63738e263 100644
--- a/src/pdf/CMakeLists.txt
+++ b/src/pdf/CMakeLists.txt
@@ -189,6 +189,14 @@ foreach(arch ${archs})
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
)