summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-01-31 14:08:46 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-07 15:44:35 +0000
commit7caf3f6cc8c27f2f470d76b7631e3b195a2c3e56 (patch)
tree23f4fc885d2edbe5b2b3cacea2b54fb775c8f9fe /src/core
parent3fbd8705374acbc95e34238fe71b979de851a47b (diff)
Find CUPS for printing on Linux
Just verify it is there. Fixes: QTBUG-100300 Change-Id: If7d13afd788086cab13bab471a4dc415fa470ece Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 70f9a3b0887dc633ee2efb218bee5625a0c4e7ae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/api/configure.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index 3eb2c5402..e61bf0476 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -8,6 +8,7 @@ if(NOT QT_CONFIGURE_RUNNING)
pkg_check_modules(GIO gio-2.0)
pkg_check_modules(XDAMAGE xdamage)
endif()
+ find_package(Cups)
find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET
OPTIONAL_COMPONENTS Positioning WebChannel PrintSupport)
@@ -62,7 +63,7 @@ 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
+ CONDITION TARGET Qt::PrintSupport AND QT_FEATURE_printer AND (CUPS_FOUND OR NOT LINUX)
)
qt_feature("webengine-webchannel" PUBLIC
SECTION "WebEngine"