diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-05-02 09:11:55 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-05-16 15:13:53 +0000 |
| commit | 53dbe2c337cb0337d01b38224fd084878175a55c (patch) | |
| tree | bfd7d87bdc3d8e8c81ca9da06148c97bd17f249d | |
| parent | 99094c116bad58c0249ef176279783f284d3e2c4 (diff) | |
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 <allan.jensen@qt.io>
(cherry picked from commit 7ed48983b0cb5025bd3bde52e57f937894e7fa1d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/pdf/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ -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 ) |