From 8deb43d1387470b85468a9dfc7b47524518a1a3f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 18 Jun 2020 16:57:00 +0200
Subject: [PATCH] Adapt to moving of UNIX services/themes into QtGui

Task-number: QTBUG-83255
Change-Id: I4770b796eb90c1ff76db940cd0cda44ea47648fa
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 src/plugins/platforms/wayland/.prev_CMakeLists.txt             | 3 ---
 src/plugins/platforms/wayland/CMakeLists.txt                   | 3 ---
 src/plugins/platforms/wayland/client.pro                       | 2 --
 src/plugins/platforms/wayland/qwaylandintegration.cpp          | 2 +-
 .../platforms/wayland/qwaylandwindowmanagerintegration_p.h     | 2 +-
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/plugins/platforms/wayland/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
index 84be2329153..5b1a73e5a1e 100644
--- a/src/plugins/platforms/wayland/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
@@ -56,8 +56,6 @@ qt_add_module(WaylandClient
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
-        Qt::ThemeSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -65,7 +63,6 @@ qt_add_module(WaylandClient
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 qt6_generate_wayland_protocol_client_sources(WaylandClient
diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index b5fd478017b..362b721beff 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -56,8 +56,6 @@ qt_add_module(WaylandClient
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
-        Qt::ThemeSupportPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -65,7 +63,6 @@ qt_add_module(WaylandClient
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 qt6_generate_wayland_protocol_client_sources(WaylandClient
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 8c8d4936977..bdcf4256127 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -2,8 +2,6 @@ TARGET = QtWaylandClient
 MODULE = waylandclient
 
 QT += core-private gui-private
-QT_FOR_PRIVATE += service_support-private
-QT_PRIVATE += theme_support-private
 
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index 97678f33180..3d0631c37b9 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -59,7 +59,7 @@
 #  include <QtGui/private/qgenericunixfontdatabase_p.h>
 #endif
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
-#include <QtThemeSupport/private/qgenericunixthemes_p.h>
+#include <QtGui/private/qgenericunixthemes_p.h>
 
 #include <QtGui/private/qguiapplication_p.h>
 
diff --git a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
index 31de6ddd34f..1c36f67bb18 100644
--- a/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
+++ b/src/plugins/platforms/wayland/qwaylandwindowmanagerintegration_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QScopedPointer>
 
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 
 #include <QtWaylandClient/private/qwayland-qt-windowmanager.h>
 #include <QtWaylandClient/qtwaylandclientglobal.h>