diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-05-02 18:10:05 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-05-16 13:29:32 +0200 |
| commit | 79b4a45bb702420f6e90da98212a4a99920ce669 (patch) | |
| tree | 4b9837f17c6e4f05fb6d17a5546b3a74f07d67c8 | |
| parent | e96fa30992cedffb9943713cd5552d8e660aa7a5 (diff) | |
| download | qtwebengine-79b4a45bb702420f6e90da98212a4a99920ce669.tar.gz | |
Add system libtiff feature
We use that feature when compiling pdfium for qtwebengine
and qtpdfium if xfa enabled.
Fixes: QTBUG-111626
Change-Id: I362739e7529f89b1705d3c25a1c9849b13a1a968
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | configure.cmake | 6 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/pdf/CMakeLists.txt | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/configure.cmake b/configure.cmake index fef1ba03a..95b8f5983 100644 --- a/configure.cmake +++ b/configure.cmake @@ -43,6 +43,7 @@ if(PkgConfig_FOUND) pkg_check_modules(LIBEVENT libevent) pkg_check_modules(MINIZIP minizip) pkg_check_modules(PNG libpng>=1.6.0) + pkg_check_modules(TIFF libtiff-4>=4.2.0) pkg_check_modules(ZLIB zlib) pkg_check_modules(RE2 re2 IMPORTED_TARGET) pkg_check_modules(ICU icu-uc>=70 icu-i18n>=70) @@ -386,6 +387,10 @@ qt_feature("webengine-system-libpng" PRIVATE LABEL "png" CONDITION UNIX AND TARGET Qt::Gui AND PNG_FOUND AND QT_FEATURE_system_png ) +qt_feature("webengine-system-libtiff" PRIVATE + LABEL "tiff" + CONDITION UNIX AND TARGET Qt::Gui AND TIFF_FOUND +) qt_feature("webengine-qt-libpng" PRIVATE LABEL "qtpng" CONDITION QT_FEATURE_static @@ -650,6 +655,7 @@ if(UNIX) qt_configure_add_summary_entry(ARGS "webengine-system-libxml") qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") qt_configure_add_summary_entry(ARGS "webengine-system-libpng") + qt_configure_add_summary_entry(ARGS "webengine-system-libtiff") qt_configure_add_summary_entry(ARGS "webengine-system-libjpeg") qt_configure_add_summary_entry(ARGS "webengine-system-libopenjpeg2") qt_configure_add_summary_entry(ARGS "webengine-system-harfbuzz") diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 501baa71c..3600e161c 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -456,6 +456,10 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_system_libpng ) extend_gn_list(gnArgArg + ARGS pdfium_use_system_libtiff + CONDITION QT_FEATURE_webengine_system_libtiff + ) + extend_gn_list(gnArgArg ARGS use_libpci CONDITION QT_FEATURE_webengine_system_libpci ) diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index f4b03e33a..0ee05def2 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -193,6 +193,10 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_qt_libpng ) extend_gn_list(gnArgArg + ARGS pdfium_use_system_libtiff + CONDITION QT_FEATURE_webengine_system_libtiff + ) + extend_gn_list(gnArgArg ARGS use_qt_libjpeg CONDITION QT_FEATURE_webengine_qt_libjpeg ) |