From 9ef67d07698ec33c60022e76dfc1578abfa785da Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 10 Jun 2020 14:21:12 +0200
Subject: [PATCH] Adapt to moving EventDispatchers to QtGui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-83255
Change-Id: Iea32600c1d2443c86723653a4fb8b568363cd796
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/wayland/.prev_CMakeLists.txt    | 6 ------
 src/plugins/platforms/wayland/CMakeLists.txt          | 1 -
 src/plugins/platforms/wayland/client.pro              | 2 +-
 src/plugins/platforms/wayland/qwaylandintegration.cpp | 2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/plugins/platforms/wayland/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
index c19adbed8b0..e7e24dac212 100644
--- a/src/plugins/platforms/wayland/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
@@ -55,7 +55,6 @@ qt_add_module(WaylandClient
         shellintegration
     LIBRARIES
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::FontDatabaseSupportPrivate
         Qt::GuiPrivate
         Qt::ServiceSupportPrivate
@@ -99,11 +98,6 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
         Qt::XkbCommonSupportPrivate
 )
 
-qt_extend_target(WaylandClient CONDITION TARGET Qt::PlatformCompositorSupportPrivate
-    LIBRARIES
-        Qt::PlatformCompositorSupportPrivate
-)
-
 qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
     LIBRARIES
         Qt::LinuxAccessibilitySupportPrivate
diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index fba3c37e5e9..696cb1f66c6 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -55,7 +55,6 @@ qt_add_module(WaylandClient
         shellintegration
     LIBRARIES
         Qt::CorePrivate
-        Qt::EventDispatcherSupportPrivate
         Qt::FontDatabaseSupportPrivate
         Qt::GuiPrivate
         Qt::ServiceSupportPrivate
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 1d496b78d44..d76bdbf7151 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -3,7 +3,7 @@ MODULE = waylandclient
 
 QT += core-private gui-private
 QT_FOR_PRIVATE += service_support-private
-QT_PRIVATE += fontdatabase_support-private eventdispatcher_support-private theme_support-private
+QT_PRIVATE += fontdatabase_support-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 b7e32c87c9b..d310a189c50 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -58,7 +58,7 @@
 #else
 #  include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
 #endif
-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtGui/private/qgenericunixeventdispatcher_p.h>
 #include <QtThemeSupport/private/qgenericunixthemes_p.h>
 
 #include <QtGui/private/qguiapplication_p.h>