From a9867972d00ff24be1bb5d01bb9c05362fbda9ef Mon Sep 17 00:00:00 2001
From: Valentin Fokin <fokinv@inf.u-szeged.hu>
Date: Thu, 19 Jul 2018 14:55:06 +0200
Subject: Fix feature dependencies

Skip build of linquist, assistant, designer, pixeltool,
qdbusviewer and distancefieldgenerator on disabled features.

This also fixes build with -no-feature-action configuration.

Change-Id: I0b7de9bae9c33ddb47d83ed577ec0e404bde360d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/linguist/linguist.pro |  7 ++++++-
 src/qdbus/qdbus.pro       |  7 ++++++-
 src/src.pro               | 16 +++++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
index e472102b4..3f54c3968 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -3,7 +3,12 @@ SUBDIRS  = \
     lrelease \
     lupdate \
     lconvert
-!no-png:qtHaveModule(widgets):qtConfig(process): SUBDIRS += linguist
+!no-png:qtHaveModule(widgets) {
+    QT_FOR_CONFIG += widgets
+    qtConfig(process):qtConfig(pushbutton):qtConfig(toolbutton) {
+        SUBDIRS += linguist
+    }
+}
 
 qtNomakeTools( \
     linguist \
diff --git a/src/qdbus/qdbus.pro b/src/qdbus/qdbus.pro
index f194b5b5e..860c1e11e 100644
--- a/src/qdbus/qdbus.pro
+++ b/src/qdbus/qdbus.pro
@@ -1,4 +1,9 @@
 TEMPLATE = subdirs
 QT_FOR_CONFIG += xml
 qtConfig(dom): SUBDIRS = qdbus
-qtHaveModule(widgets): SUBDIRS += qdbusviewer
+qtHaveModule(widgets) {
+    QT_FOR_CONFIG += widgets
+    qtConfig(dialogbuttonbox):qtConfig(inputdialog):qtConfig(messagebox):qtConfig(menu) {
+        SUBDIRS += qdbusviewer
+    }
+}
diff --git a/src/src.pro b/src/src.pro
index 2796171d6..7a1af0078 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,13 +4,15 @@ qtHaveModule(widgets) {
     no-png {
         message("Some graphics-related tools are unavailable without PNG support")
     } else {
-        SUBDIRS = assistant \
-                  pixeltool \
-                  designer
-
-        qtHaveModule(quick):qtConfig(thread): SUBDIRS += distancefieldgenerator
-
-        linguist.depends = designer
+        QT_FOR_CONFIG += widgets
+        qtConfig(pushbutton):qtConfig(toolbutton) {
+            SUBDIRS = assistant \
+                      designer \
+                      pixeltool
+
+            linguist.depends = designer
+        }
+        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
     }
 }
 
-- 
cgit v1.2.3