From 818afa359358c310329537fcd5fbe43cefeca185 Mon Sep 17 00:00:00 2001
From: Elvis Lee <kwangwoong.lee@lge.com>
Date: Thu, 31 Dec 2020 13:49:10 +0900
Subject: Export wl-shell integration

Support wl-shell integration
as a module for external build

Change-Id: I6cd5e5c35ff1162943ffdcbe7ff834f30783e5a8
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
 .../shellintegration/wl-shell/CMakeLists.txt       | 36 +++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/shellintegration/wl-shell/CMakeLists.txt b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
index 56cc5b853..e87bc5c40 100644
--- a/src/plugins/shellintegration/wl-shell/CMakeLists.txt
+++ b/src/plugins/shellintegration/wl-shell/CMakeLists.txt
@@ -1,36 +1,50 @@
 # Generated from wl-shell.pro.
 
 #####################################################################
-## QWaylandWlShellIntegrationPlugin Plugin:
+## WlShellIntegration Module:
 #####################################################################
 
-qt_internal_add_plugin(QWaylandWlShellIntegrationPlugin
-    OUTPUT_NAME wl-shell
-    TYPE wayland-shell-integration
+qt_internal_add_module(WlShellIntegration
+    CONFIG_MODULE_NAME wl_shell_integration
+    INTERNAL_MODULE
     SOURCES
-        main.cpp
         qwaylandwlshellintegration.cpp qwaylandwlshellintegration_p.h
         qwaylandwlshellsurface.cpp qwaylandwlshellsurface_p.h
     PUBLIC_LIBRARIES
-        Qt::Core
-        Qt::Gui
         Qt::GuiPrivate
         Qt::WaylandClientPrivate
         Wayland::Client
 )
 
-qt6_generate_wayland_protocol_client_sources(QWaylandWlShellIntegrationPlugin
+qt6_generate_wayland_protocol_client_sources(WlShellIntegration
     FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/../../../3rdparty/protocol/wayland.xml
 )
 
-#### Keys ignored in scope 1:.:.:wl-shell.pro:<TRUE>:
-# OTHER_FILES = "wl-shell.json"
+#### Keys ignored in scope 2:.:.:wl-shell-integration.pro:<TRUE>:
+# MODULE = "wl_shell_integration"
 
 ## Scopes:
 #####################################################################
 
-qt_internal_extend_target(QWaylandWlShellIntegrationPlugin CONDITION QT_FEATURE_xkbcommon
+qt_internal_extend_target(WlShellIntegration CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         XKB::XKB
 )
+#####################################################################
+## QWaylandWlShellIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandWlShellIntegrationPlugin
+    OUTPUT_NAME wl-shell-plugin
+    TYPE wayland-shell-integration
+    SOURCES
+        main.cpp
+    PUBLIC_LIBRARIES
+        Qt::GuiPrivate
+        Qt::WaylandClientPrivate
+        Qt::WlShellIntegrationPrivate
+)
+
+#### Keys ignored in scope 4:.:.:wl-shell-plugin.pro:<TRUE>:
+# OTHER_FILES = "wl-shell.json"
-- 
cgit v1.2.3