From 798ed169d86a192c0e6efe63702992b26f7f0775 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Thu, 26 Jan 2017 10:08:14 +0100
Subject: [PATCH] Fix printsupport dependencies

This makes -no-feature-printer and -no-feature-combobox work.

Change-Id: I1097ab0a81f1c92b808c3e36ced0db9117db559a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/printsupport/configure.json | 4 ++--
 1 file 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": {