diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2021-10-13 16:37:12 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-19 09:55:54 +0000 |
| commit | be524ce069361f2a913b23e1a2dd351afbef821f (patch) | |
| tree | f5c7816d630bfadca2f156d6acdeaae13793dbbe | |
| parent | 082f47594a8616ec85ff1e9be200fd2e1dbcea0f (diff) | |
Handle qtpdf compilation with static runtime
Add feature to enable compilation with static runtime.
Fixes: QTBUG-94046
Change-Id: I6e150cfaad020dfd942c45111139556b7e50dce5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit c6fa25afab89729c9e52d6de5b41200818a7896c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -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 b526c5c2f..596df6210 100644 --- a/src/pdf/CMakeLists.txt +++ b/src/pdf/CMakeLists.txt @@ -133,6 +133,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() |