From 8e89394a5e79e5f5409bd5e23b2addbb72f87d05 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 31 Jan 2022 14:08:46 +0100 Subject: Find CUPS for printing on Linux Just verify it is there. Fixes: QTBUG-100300 Change-Id: If7d13afd788086cab13bab471a4dc415fa470ece Reviewed-by: Michal Klocek (cherry picked from commit 70f9a3b0887dc633ee2efb218bee5625a0c4e7ae) Reviewed-by: Qt Cherry-pick Bot --- src/core/api/configure.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 7970617ba..375aee727 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -13,6 +13,7 @@ if(NOT QT_CONFIGURE_RUNNING) pkg_check_modules(GIO gio-2.0) endif() endif() + find_package(Cups) find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Positioning WebChannel PrintSupport) @@ -80,7 +81,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" -- cgit v1.2.3