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, 69 insertions, 4 deletions

diff --git a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
index f264dfbe9..5cf358b00 100644
--- a/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/brcm-egl/CMakeLists.txt
@@ -18,7 +18,6 @@ qt_internal_add_plugin(QWaylandBrcmEglClientBufferPlugin
         ${CMAKE_DL_LIBS}
         EGL::EGL
         Qt::Core
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::WaylandClientPrivate
         Wayland::Client
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/.prev_CMakeLists.txt
new file mode 100644
index 000000000..b1732b014
--- /dev/null
+++ b/src/plugins/hardwareintegration/client/wayland-egl/.prev_CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from wayland-egl.pro.
+
+#####################################################################
+## QWaylandEglClientBufferPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandEglClientBufferPlugin
+    OUTPUT_NAME qt-plugin-wayland-egl
+    TYPE wayland-graphics-integration-client
+    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:.:.:wayland-egl.pro:<TRUE>:
+# OTHER_FILES = "wayland-egl.json"
diff --git a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
index b7e274170..1742f1173 100644
--- a/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/wayland-egl/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandEglClientBufferPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandEglClientBufferPlugin
     OUTPUT_NAME qt-plugin-wayland-egl
@@ -16,9 +17,9 @@ qt_internal_add_plugin(QWaylandEglClientBufferPlugin
     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/hardwareintegration/client/xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/.prev_CMakeLists.txt
new file mode 100644
index 000000000..f575d44e9
--- /dev/null
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/.prev_CMakeLists.txt
@@ -0,0 +1,36 @@
+# Generated from xcomposite-egl.pro.
+
+#####################################################################
+## QWaylandXCompositeEglClientBufferPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin
+    OUTPUT_NAME xcomposite-egl
+    TYPE wayland-graphics-integration-client
+    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(QWaylandXCompositeEglClientBufferPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/client/xcomposite_share/../../../extensions/xcomposite.xml
+)
+
+#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>:
+# OTHER_FILES = "xcomposite-egl.json"
+# QMAKE_CXXFLAGS_WARN_ON = "--Wcast-qual"
diff --git a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
index 6ed42e74f..9b7324ccd 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-egl/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandXCompositeEglClientBufferPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin
     OUTPUT_NAME xcomposite-egl
@@ -20,7 +21,6 @@ qt_internal_add_plugin(QWaylandXCompositeEglClientBufferPlugin
         EGL::EGL
         PkgConfig::XComposite
         Qt::Core
-        Qt::EglSupportPrivate
         Qt::Gui
         Qt::WaylandClientPrivate
         Wayland::Client
diff --git a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
index 54c18d0ed..0f0ea0733 100644
--- a/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/client/xcomposite-glx/CMakeLists.txt
@@ -20,7 +20,6 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferPlugin
         ${CMAKE_DL_LIBS}
         PkgConfig::XComposite
         Qt::Core
-        Qt::GlxSupportPrivate
         Qt::Gui
         Qt::WaylandClientPrivate
         Wayland::Client