summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-01-26 10:08:14 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-01-26 13:51:54 +0000
commit798ed169d86a192c0e6efe63702992b26f7f0775 (patch)
tree853fb2be3649effa5c01cbda4a9cf65475802e9c /src
parent8d752b5151c9890b76d50c4a479ab32dd0eca10c (diff)
Fix printsupport dependencies
This makes -no-feature-printer and -no-feature-combobox work. Change-Id: I1097ab0a81f1c92b808c3e36ced0db9117db559a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/printsupport/configure.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index a4855212fd..dfef0bcd6c 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -28,13 +28,13 @@
"label": "CUPS",
"purpose": "Provides support for the Common Unix Printing System.",
"section": "Painting",
- "condition": "libs.cups",
+ "condition": "libs.cups && features.printer",
"output": [ "privateFeature", "feature" ]
},
"cupsjobwidget": {
"label": "CUPS job control widget",
"section": "Widgets",
- "condition": "features.cups && features.calendarwidget && features.datetimeedit && features.groupbox",
+ "condition": "features.cups && features.calendarwidget && features.datetimeedit && features.groupbox && features.combobox",
"output": [ "privateFeature", "feature" ]
},
"printer": {