From fc7eaa1ece889153e756005e4457958014cf89b1 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Thu, 30 Aug 2018 16:18:49 +0200
Subject: [PATCH] Client: Make features for shell integrations

[ChangeLog][QPA plugin] Shell integrations are now features that can be enabled
or disabled at build time.

Change-Id: I1c48bb5d444074ac25331cb1ca8a9f49ebcd9805
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/plugins/platforms/wayland/configure.json  | 36 +++++++++++++++++++
 .../shellintegration/shellintegration.pro     | 13 ++++---
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/plugins/platforms/wayland/configure.json b/src/plugins/platforms/wayland/configure.json
index ef5e87bb7e5..e5a0e5c7f16 100644
--- a/src/plugins/platforms/wayland/configure.json
+++ b/src/plugins/platforms/wayland/configure.json
@@ -81,6 +81,31 @@
             "condition": "features.draganddrop || features.clipboard",
             "output": [ "privateFeature" ]
         },
+        "wayland-client-ivi-shell": {
+            "label": "ivi-shell",
+            "condition": "features.wayland-client",
+            "output": [ "privateFeature" ]
+        },
+        "wayland-client-wl-shell": {
+            "label": "wl-shell (deprecated)",
+            "condition": "features.wayland-client",
+            "output": [ "privateFeature" ]
+        },
+        "wayland-client-xdg-shell": {
+            "label": "xdg-shell",
+            "condition": "features.wayland-client",
+            "output": [ "privateFeature" ]
+        },
+        "wayland-client-xdg-shell-v5": {
+            "label": "xdg-shell unstable v5 (deprecated)",
+            "condition": "features.wayland-client",
+            "output": [ "privateFeature" ]
+        },
+        "wayland-client-xdg-shell-v6": {
+            "label": "xdg-shell unstable v6",
+            "condition": "features.wayland-client",
+            "output": [ "privateFeature" ]
+        },
         "wayland-egl": {
             "label": "EGL",
             "condition": "features.wayland-client && features.opengl && features.egl && libs.wayland-egl",
@@ -140,6 +165,17 @@
                 "wayland-shm-emulation-server-buffer"
             ]
         },
+        {
+            "section": "Qt Wayland Client Shell Integrations",
+            "condition": "features.wayland-client",
+            "entries": [
+                "wayland-client-xdg-shell",
+                "wayland-client-xdg-shell-v5",
+                "wayland-client-xdg-shell-v6",
+                "wayland-client-ivi-shell",
+                "wayland-client-wl-shell"
+            ]
+        },
         "wayland-client"
     ]
 }
diff --git a/src/plugins/platforms/wayland/plugins/shellintegration/shellintegration.pro b/src/plugins/platforms/wayland/plugins/shellintegration/shellintegration.pro
index 48b6efa363f..627c7668eec 100644
--- a/src/plugins/platforms/wayland/plugins/shellintegration/shellintegration.pro
+++ b/src/plugins/platforms/wayland/plugins/shellintegration/shellintegration.pro
@@ -1,9 +1,8 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += waylandclient-private
 
-SUBDIRS += \
-    ivi-shell \
-    xdg-shell \
-    xdg-shell-v5 \
-    xdg-shell-v6 \
-    wl-shell \
-
+qtConfig(wayland-client-ivi-shell): SUBDIRS += ivi-shell
+qtConfig(wayland-client-wl-shell): SUBDIRS += wl-shell
+qtConfig(wayland-client-xdg-shell): SUBDIRS += xdg-shell
+qtConfig(wayland-client-xdg-shell-v5): SUBDIRS += xdg-shell-v5
+qtConfig(wayland-client-xdg-shell-v6): SUBDIRS += xdg-shell-v6