From acc7269b3465ac503f18b4dd759a414c1aadf290 Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Wed, 4 Oct 2017 15:51:40 +0200
Subject: Do not entirely skip designer if there is no process support

As UiTools and UiPlugin can be built without any process support, these
parts should be built on platforms that have support for them (winrt
for example).

Task-number: QTBUG-63597
Change-Id: I0928b4e229f44abfbb89692a82d1d7ad8e794227
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/designer/src/src.pro | 23 ++++++++++++++---------
 src/src.pro              |  8 +++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 6915e34e9..79e9e64ee 100644
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -2,18 +2,23 @@ TEMPLATE = subdirs
 
 SUBDIRS = \
     uiplugin \
-    uitools \
-    lib \
-    components \
-    designer
+    uitools
+
+qtConfig(process) {
+    SUBDIRS += \
+        lib \
+        components \
+        designer
+
+    lib.depends = uiplugin
+    components.depends = lib
+    designer.depends = components
+    plugins.depends = lib
 
-contains(QT_CONFIG, shared): SUBDIRS += plugins
+    contains(QT_CONFIG, shared): SUBDIRS += plugins
+}
 
 uitools.depends = uiplugin
-lib.depends = uiplugin
-components.depends = lib
-designer.depends = components
-plugins.depends = lib
 
 qtNomakeTools( \
     lib \
diff --git a/src/src.pro b/src/src.pro
index 13d9ec089..41064a5d5 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,12 +5,10 @@ qtHaveModule(widgets) {
         message("Some graphics-related tools are unavailable without PNG support")
     } else {
         SUBDIRS = assistant \
-                  pixeltool
+                  pixeltool \
+                  designer
 
-        qtConfig(process) {
-            SUBDIRS += designer
-            linguist.depends = designer
-        }
+        linguist.depends = designer
     }
 }
 
-- 
cgit v1.2.3