diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-10-13 16:37:12 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2022-03-17 11:39:25 +0100 |
commit | c6fa25afab89729c9e52d6de5b41200818a7896c (patch) | |
tree | abbbdfbad9581d8037218021211079d48535771b /src/pdf | |
parent | 68db00bcbe459ea5518a653b85fac567bdee2186 (diff) |
Handle qtpdf compilation with static runtime
Add feature to enable compilation with static runtime.
Fixes: QTBUG-94046
Pick-to: 6.3
Change-Id: I6e150cfaad020dfd942c45111139556b7e50dce5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/pdf')
-rw-r--r-- | src/pdf/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/pdf/configure.cmake | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/pdf/CMakeLists.txt b/src/pdf/CMakeLists.txt index 0baeba756..841eea446 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -134,6 +134,10 @@ foreach(arch ${archs}) ninja_use_custom_environment_files=false safe_browsing_mode=0 ) + extend_gn_list(gnArgArg + ARGS qt_uses_static_runtime + CONDITION QT_FEATURE_pdf_static_runtime + ) endif() extend_gn_list(gnArgArg diff --git a/src/pdf/configure.cmake b/src/pdf/configure.cmake index 6002f1747..a252d7da6 100644 --- a/src/pdf/configure.cmake +++ b/src/pdf/configure.cmake @@ -33,7 +33,11 @@ qt_feature("pdf-bitcode" PRIVATE PURPOSE "Enables bitcode" CONDITION IOS ) - +qt_feature("pdf-static-runtime" PRIVATE + LABEL "Use static runtime" + PURPOSE "Enables static runtime" + CONDITION WIN32 AND QT_FEATURE_static AND QT_FEATURE_static_runtime +) qt_configure_add_summary_section(NAME "Qt PDF") qt_configure_add_summary_entry(ARGS "pdf-v8") qt_configure_add_summary_entry(ARGS "pdf-xfa") @@ -42,4 +46,5 @@ qt_configure_add_summary_entry(ARGS "pdf-xfa-gif") qt_configure_add_summary_entry(ARGS "pdf-xfa-png") qt_configure_add_summary_entry(ARGS "pdf-xfa-tiff") qt_configure_add_summary_entry(ARGS "pdf-bitcode") +qt_configure_add_summary_entry(ARGS "pdf-static-runtime") qt_configure_end_summary_section() |