summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-01-31 14:08:46 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-06 11:45:34 +0100
commit70f9a3b0887dc633ee2efb218bee5625a0c4e7ae (patch)
tree68fc05c575ee7fb375a10d7fd053665e34301672 /src/core
parent9aa532a5c54ef83951ce97a59f58269f933e8a61 (diff)
Find CUPS for printing on Linux
Just verify it is there. Pick-to: 6.3 6.2 Fixes: QTBUG-100300 Change-Id: If7d13afd788086cab13bab471a4dc415fa470ece Reviewed-by: Michal Klocek <michal.klocek@qt.io>
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 b13d72555..4b1a8e48a 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)
@@ -75,7 +76,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-pepper-plugins" PRIVATE
LABEL "Pepper Plugins"