diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-04-20 09:10:05 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-09 16:59:09 +0000 |
| commit | 8d6232346e2033285dd6390baadba6a29c7332c5 (patch) | |
| tree | af603244d6db301d204ac466f54589223d10bd47 | |
| parent | 9949d933571467e4ab129ac2fefe9d39db613d37 (diff) | |
Fix printing/no-printing builds
If no 'printing' we should also disable 'cups' otherwise
it asserts in gn. Moreover we use cups on macos and linux only.
Change-Id: Id0c9b34746204e985032d7c42868aeb8567b8e8f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 3f5b5213d42376470274f0e3aaa51731f0d2552a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/core/api/configure.cmake | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 9fd27d877..9e6370260 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -303,6 +303,10 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_printing_and_pdf ) extend_gn_list(gnArgArg + ARGS use_cups + CONDITION QT_FEATURE_webengine_printing_and_pdf AND NOT WIN32 + ) + extend_gn_list(gnArgArg ARGS enable_plugins CONDITION QT_FEATURE_webengine_pepper_plugins ) diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 375aee727..e2543cfac 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -81,7 +81,8 @@ qt_feature("webengine-printing-and-pdf" PRIVATE LABEL "Printing and PDF" PURPOSE "Provides printing and output to PDF." AUTODETECT NOT QT_FEATURE_webengine_embedded_build - CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND (CUPS_FOUND OR NOT LINUX) + CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND + (CUPS_FOUND OR WIN32) ) qt_feature("webengine-webchannel" PUBLIC SECTION "WebEngine" |