Adapt to recent qtbase changes and update dependencies

 - moving linuxaccessibility/xkbcommon/eglsupport/glxsupport to QtGui
 - event refactoring

Task-number: QTBUG-83255
Change-Id: Ic82ee6ef5652413781468edb58c601ee7dce2e3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

6 files changed, 68 insertions, 4 deletions

diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
index 4c6fa7a2..e8776766 100644
--- a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
@@ -18,7 +18,6 @@ qt_internal_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin
         ${CMAKE_DL_LIBS}
         EGL::EGL
         Qt::Core
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::WaylandClientPrivate
         Wayland::Client
diff --git a/src/plugins/platforms/qwayland-egl/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-egl/.prev_CMakeLists.txt
new file mode 100644
index 00000000..e9e5e0b1
--- /dev/null
+++ b/src/plugins/platforms/qwayland-egl/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qwayland-egl.pro.
+
+#####################################################################
+## QWaylandEglPlatformIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin
+    OUTPUT_NAME qwayland-egl
+    TYPE platforms
+    SOURCES
+        ../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h
+        ../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h
+        ../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp ../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+        ../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp ../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../hardwareintegration/client/wayland-egl
+    PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
+        EGL::EGL
+        Qt::Core
+        Qt::Gui
+        Qt::OpenGLPrivate
+        Qt::WaylandClientPrivate
+        Wayland::Client
+        Wayland::Egl
+)
+
+#### Keys ignored in scope 1:.:.:qwayland-egl.pro:<TRUE>:
+# OTHER_FILES = "qwayland-egl.json"
diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt
index dd6bc049..5c009df8 100644
--- a/src/plugins/platforms/qwayland-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandEglPlatformIntegrationPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin
     OUTPUT_NAME qwayland-egl
@@ -16,9 +17,9 @@ qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin
     INCLUDE_DIRECTORIES
         ../../../hardwareintegration/client/wayland-egl
     PUBLIC_LIBRARIES
+        ${CMAKE_DL_LIBS}
         EGL::EGL
         Qt::Core
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::OpenGLPrivate
         Qt::WaylandClientPrivate
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/.prev_CMakeLists.txt
new file mode 100644
index 00000000..59382cc0
--- /dev/null
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/.prev_CMakeLists.txt
@@ -0,0 +1,35 @@
+# Generated from qwayland-xcomposite-egl.pro.
+
+#####################################################################
+## QWaylandXCompositeEglPlatformIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin
+    OUTPUT_NAME qwayland-xcomposite-egl
+    TYPE platforms
+    SOURCES
+        ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h
+        ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
+        ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp ../../../hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.h
+        ../../../hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.cpp ../../../hardwareintegration/client/xcomposite_share/qwaylandxcompositebuffer.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../hardwareintegration/client/xcomposite-egl
+        ../../../hardwareintegration/client/xcomposite_share
+    PUBLIC_LIBRARIES
+        EGL::EGL
+        PkgConfig::XComposite
+        Qt::Core
+        Qt::Gui
+        Qt::WaylandClientPrivate
+        Wayland::Client
+        X11::X11
+)
+
+qt6_generate_wayland_protocol_client_sources(QWaylandXCompositeEglPlatformIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
+)
+
+#### Keys ignored in scope 1:.:.:qwayland-xcomposite-egl.pro:<TRUE>:
+# OTHER_FILES = "qwayland-xcomposite-egl.json"
diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
index a4ba2137..b9363707 100644
--- a/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-xcomposite-egl/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandXCompositeEglPlatformIntegrationPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin
     OUTPUT_NAME qwayland-xcomposite-egl
@@ -20,7 +21,6 @@ qt_internal_add_plugin(QWaylandXCompositeEglPlatformIntegrationPlugin
         EGL::EGL
         PkgConfig::XComposite
         Qt::Core
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::WaylandClientPrivate
         Wayland::Client
diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
index e027e482..f41af9f4 100644
--- a/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/platforms/qwayland-xcomposite-glx/CMakeLists.txt
@@ -21,7 +21,6 @@ qt_internal_add_plugin(QWaylandXCompositeGlxPlatformIntegrationPlugin
         ${CMAKE_DL_LIBS}
         PkgConfig::XComposite
         Qt::Core
-        Qt::GlxSupportPrivate
         Qt::Gui
         Qt::WaylandClientPrivate
         Wayland::Client