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>

60 files changed, 307 insertions, 151 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 340fe9e8c..88223a419 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,16 +27,11 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
     Core
     Gui
     OpenGL
+    PlatformHeaders
 )
 
 find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
-    EglSupport
-    GlxSupport
-    LinuxAccessibilitySupport
     Quick
-    ServiceSupport
-    XkbCommonSupport
-    ThemeSupport
 )
 # special case end
 
diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt
index 5b1a73e5a..ac323a56f 100644
--- a/src/client/.prev_CMakeLists.txt
+++ b/src/client/.prev_CMakeLists.txt
@@ -56,6 +56,7 @@ qt_add_module(WaylandClient
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
+        Qt::PlatformHeadersPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -87,18 +88,6 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
-    LIBRARIES
-        Qt::XkbCommonSupportPrivate
-    PRIVATE_MODULE_INTERFACE
-        Qt::XkbCommonSupportPrivate
-)
-
-qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
-    LIBRARIES
-        Qt::LinuxAccessibilitySupportPrivate
-)
-
 qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
     SOURCES
         qwaylandclipboard.cpp qwaylandclipboard_p.h
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 362b721be..b49a72920 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -56,6 +56,7 @@ qt_add_module(WaylandClient
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
+        Qt::PlatformHeadersPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -87,18 +88,6 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
-    LIBRARIES
-        Qt::XkbCommonSupportPrivate
-    PRIVATE_MODULE_INTERFACE
-        Qt::XkbCommonSupportPrivate
-)
-
-qt_extend_target(WaylandClient CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
-    LIBRARIES
-        Qt::LinuxAccessibilitySupportPrivate
-)
-
 qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
     SOURCES
         qwaylandclipboard.cpp qwaylandclipboard_p.h
diff --git a/src/client/client.pro b/src/client/client.pro
index bdcf42561..38b129e9e 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -3,6 +3,8 @@ MODULE = waylandclient
 
 QT += core-private gui-private
 
+QT_PRIVATE += platformheaders-private
+
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
@@ -13,13 +15,6 @@ use_gold_linker: CONFIG += no_linker_version_script
 CONFIG -= precompile_header
 CONFIG += link_pkgconfig wayland-scanner
 
-qtConfig(xkbcommon) {
-    QT_FOR_PRIVATE += xkbcommon_support-private
-}
-
-qtHaveModule(linuxaccessibility_support-private): \
-    QT_PRIVATE += linuxaccessibility_support-private
-
 QMAKE_USE += wayland-client
 
 INCLUDEPATH += $$PWD/../shared
diff --git a/src/client/qwaylanddisplay_p.h b/src/client/qwaylanddisplay_p.h
index 818b5ba90..d386c66ac 100644
--- a/src/client/qwaylanddisplay_p.h
+++ b/src/client/qwaylanddisplay_p.h
@@ -66,7 +66,7 @@
 #include <qpa/qplatforminputcontextfactory_p.h>
 
 #if QT_CONFIG(xkbcommon)
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 struct wl_cursor_image;
diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
index af9458b44..e86274276 100644
--- a/src/client/qwaylandinputdevice.cpp
+++ b/src/client/qwaylandinputdevice.cpp
@@ -1428,16 +1428,16 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
     }
 
     // If the touch point was pressed earlier this frame, we don't want to overwrite its state.
-    if (tp.state != Qt::TouchPointPressed)
-        tp.state = state;
+    if (tp.state != QEventPoint::Pressed)
+        tp.state = QEventPoint::State(state);
 
-    tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
+    tp.pressure = tp.state == QEventPoint::Released ? 0 : 1;
 }
 
 bool QWaylandInputDevice::Touch::allTouchPointsReleased()
 {
     for (const auto &tp : qAsConst(mPendingTouchPoints)) {
-        if (tp.state != Qt::TouchPointReleased)
+        if (tp.state != QEventPoint::Released)
             return false;
     }
     return true;
@@ -1449,7 +1449,7 @@ void QWaylandInputDevice::Touch::releasePoints()
         return;
 
     for (QWindowSystemInterface::TouchPoint &tp : mPendingTouchPoints)
-        tp.state = Qt::TouchPointReleased;
+        tp.state = QEventPoint::Released;
 
     touch_frame();
 }
@@ -1467,7 +1467,7 @@ void QWaylandInputDevice::Touch::touch_frame()
         QMargins margins = window->frameMargins();
         QPoint p = tp.area.center().toPoint();
         QPointF localPos(window->mapFromGlobal(QPoint(p.x() + margins.left(), p.y() + margins.top())));
-        if (mFocus->touchDragDecoration(mParent, localPos, tp.area.center(), tp.state, mParent->modifiers()))
+        if (mFocus->touchDragDecoration(mParent, localPos, tp.area.center(), Qt::TouchPointState(tp.state), mParent->modifiers()))
             return;
     }
 
@@ -1478,9 +1478,9 @@ void QWaylandInputDevice::Touch::touch_frame()
     mPendingTouchPoints.clear();
     for (const auto &prevPoint: prevTouchPoints) {
         // All non-released touch points should be part of the next touch event
-        if (prevPoint.state != Qt::TouchPointReleased) {
+        if (prevPoint.state != QEventPoint::Released) {
             QWindowSystemInterface::TouchPoint tp = prevPoint;
-            tp.state = Qt::TouchPointStationary; // ... as stationary (unless proven otherwise)
+            tp.state = QEventPoint::Stationary; // ... as stationary (unless proven otherwise)
             mPendingTouchPoints.append(tp);
         }
     }
diff --git a/src/client/qwaylandinputdevice_p.h b/src/client/qwaylandinputdevice_p.h
index 8e2dd184b..31bd30088 100644
--- a/src/client/qwaylandinputdevice_p.h
+++ b/src/client/qwaylandinputdevice_p.h
@@ -65,7 +65,7 @@
 #include <QtWaylandClient/private/qwayland-wayland.h>
 
 #if QT_CONFIG(xkbcommon)
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 #include <QtCore/QDebug>
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 3d0631c37..0aa18f098 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -89,11 +89,11 @@
 #include "qwaylandinputdeviceintegrationfactory_p.h"
 
 #if QT_CONFIG(accessibility_atspi_bridge)
-#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
+#include <QtGui/private/qspiaccessiblebridge_p.h>
 #endif
 
 #if QT_CONFIG(xkbcommon)
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 #if QT_CONFIG(vulkan)
diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp
index bf54a1a00..da7885477 100644
--- a/src/client/qwaylandnativeinterface.cpp
+++ b/src/client/qwaylandnativeinterface.cpp
@@ -55,7 +55,7 @@
 #include <QtWaylandClient/private/qwaylandvulkanwindow_p.h>
 #endif
 
-#include <QtPlatformHeaders/qwaylandwindowfunctions.h>
+#include <QtPlatformHeaders/private/qwaylandwindowfunctions_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/client/qwaylandtouch.cpp b/src/client/qwaylandtouch.cpp
index 06fa822a3..6c7239034 100644
--- a/src/client/qwaylandtouch.cpp
+++ b/src/client/qwaylandtouch.cpp
@@ -101,13 +101,12 @@ void QWaylandTouchExtension::touch_extension_touch(uint32_t time,
 
     QWindowSystemInterface::TouchPoint tp;
     tp.id = id;
-    tp.state = Qt::TouchPointState(int(state & 0xFFFF));
+    tp.state = QEventPoint::State(int(state & 0xFFFF));
     int sentPointCount = state >> 16;
     if (!mPointsLeft) {
         Q_ASSERT(sentPointCount > 0);
         mPointsLeft = sentPointCount;
     }
-    tp.flags = QTouchEvent::TouchPoint::InfoFlags(int(flags & 0xFFFF));
 
     if (!mTouchDevice)
         registerDevice(flags >> 16);
@@ -146,7 +145,7 @@ void QWaylandTouchExtension::sendTouchEvent()
     // Copy all points, that are in the previous but not in the current list, as stationary.
     for (int i = 0; i < mPrevTouchPoints.count(); ++i) {
         const QWindowSystemInterface::TouchPoint &prevPoint(mPrevTouchPoints.at(i));
-        if (prevPoint.state == Qt::TouchPointReleased)
+        if (prevPoint.state == QEventPoint::Released)
             continue;
         bool found = false;
         for (int j = 0; j < mTouchPoints.count(); ++j)
@@ -156,7 +155,7 @@ void QWaylandTouchExtension::sendTouchEvent()
             }
         if (!found) {
             QWindowSystemInterface::TouchPoint p = prevPoint;
-            p.state = Qt::TouchPointStationary;
+            p.state = QEventPoint::Stationary;
             mTouchPoints.append(p);
         }
     }
@@ -168,7 +167,7 @@ void QWaylandTouchExtension::sendTouchEvent()
 
     QWindowSystemInterface::handleTouchEvent(mTargetWindow, mTimestamp, mTouchDevice, mTouchPoints);
 
-    Qt::TouchPointStates states = {};
+    QEventPoint::States states = {};
     for (int i = 0; i < mTouchPoints.count(); ++i)
         states |= mTouchPoints.at(i).state;
 
@@ -179,7 +178,7 @@ void QWaylandTouchExtension::sendTouchEvent()
         for (int i = 0; i < mTouchPoints.count(); ++i) {
             const QWindowSystemInterface::TouchPoint &tp(mTouchPoints.at(i));
             if (tp.id == mMouseSourceId) {
-                const bool released = tp.state == Qt::TouchPointReleased;
+                const bool released = tp.state == QEventPoint::Released;
                 Qt::MouseButtons buttons = released ? Qt::NoButton : Qt::LeftButton;
                 QEvent::Type eventType = firstPress ? QEvent::MouseButtonPress
                                                     : released ? QEvent::MouseButtonRelease
diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt
index d5bcb7138..bb9809c75 100644
--- a/src/compositor/.prev_CMakeLists.txt
+++ b/src/compositor/.prev_CMakeLists.txt
@@ -132,15 +132,6 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
         Qt::OpenGL
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
-    LIBRARIES
-        Qt::XkbCommonSupportPrivate
-    PUBLIC_LIBRARIES
-        XKB::XKB
-    PRIVATE_MODULE_INTERFACE
-        Qt::XkbCommonSupportPrivate
-)
-
 qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
     SOURCES
         extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h
@@ -165,6 +156,11 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
         wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h
 )
 
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
+    PUBLIC_LIBRARIES
+        XKB::XKB
+)
+
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
     SOURCES
         compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt
index 18e1cd6cc..71a7e133c 100644
--- a/src/compositor/CMakeLists.txt
+++ b/src/compositor/CMakeLists.txt
@@ -132,15 +132,6 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl
         Qt::OpenGL
 )
 
-qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
-    LIBRARIES
-        Qt::XkbCommonSupportPrivate
-    PUBLIC_LIBRARIES
-        XKB::XKB
-    PRIVATE_MODULE_INTERFACE
-        Qt::XkbCommonSupportPrivate
-)
-
 qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick
     SOURCES
         extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h
@@ -165,6 +156,11 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice
         wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h
 )
 
+qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon
+    PUBLIC_LIBRARIES
+        XKB::XKB
+)
+
 qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im
     SOURCES
         compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
index 7041769a0..f9c67328b 100644
--- a/src/compositor/compositor.pro
+++ b/src/compositor/compositor.pro
@@ -5,10 +5,6 @@ QT = core gui-private
 
 qtConfig(opengl): QT += opengl
 
-qtConfig(xkbcommon) {
-    QT_FOR_PRIVATE += xkbcommon_support-private
-}
-
 qtHaveModule(quick): QT += quick
 
 CONFIG -= precompile_header
diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri
index bbc3a03e7..53101f474 100644
--- a/src/compositor/compositor_api/compositor_api.pri
+++ b/src/compositor/compositor_api/compositor_api.pri
@@ -55,7 +55,7 @@ qtConfig(im) {
         compositor_api/qwaylandinputmethodcontrol.cpp
 }
 
-QT += core-private
+QT += core-private gui-private
 
 qtConfig(draganddrop) {
     HEADERS += \
diff --git a/src/compositor/compositor_api/qwaylandcompositor_p.h b/src/compositor/compositor_api/qwaylandcompositor_p.h
index 4f84c902f..eb0dd3073 100644
--- a/src/compositor/compositor_api/qwaylandcompositor_p.h
+++ b/src/compositor/compositor_api/qwaylandcompositor_p.h
@@ -53,7 +53,7 @@
 #include <vector>
 
 #if QT_CONFIG(xkbcommon)
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
index 47d7843f2..1799ba05a 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
@@ -55,7 +55,7 @@
 
 #if QT_CONFIG(xkbcommon)
 #include <xkbcommon/xkbcommon.h>
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 
diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp
index b83d70b77..03ccdbbc4 100644
--- a/src/compositor/compositor_api/qwaylandtouch.cpp
+++ b/src/compositor/compositor_api/qwaylandtouch.cpp
@@ -217,8 +217,8 @@ void QWaylandTouch::sendFullTouchEvent(QWaylandSurface *surface, QTouchEvent *ev
         const QTouchEvent::TouchPoint &tp(points.at(i));
         // Convert the local pos in the compositor window to surface-relative.
         const int id = d->toSequentialWaylandId(tp.id());
-        sendTouchPointEvent(surface, id, tp.position(), tp.state());
-        if (tp.state() == Qt::TouchPointReleased)
+        sendTouchPointEvent(surface, id, tp.position(), Qt::TouchPointState(tp.state()));
+        if (tp.state() == QEventPoint::Released)
             d->ids[id] = -1;
     }
     sendFrameEvent(surface->client());
diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp
index 5f6adac9d..6be9c0cde 100644
--- a/src/compositor/extensions/qwaylandtextinput.cpp
+++ b/src/compositor/extensions/qwaylandtextinput.cpp
@@ -41,7 +41,7 @@
 #include <QInputMethodEvent>
 
 #if QT_CONFIG(xkbcommon)
-#include <QtXkbCommonSupport/private/qxkbcommon_p.h>
+#include <QtGui/private/qxkbcommon_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp
index 032545db6..2df661216 100644
--- a/src/compositor/extensions/qwlqttouch.cpp
+++ b/src/compositor/extensions/qwlqttouch.cpp
@@ -77,19 +77,19 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *s
         // included in the touch point events.
         int sentPointCount = 0;
         for (int i = 0; i < pointCount; ++i) {
-            if (points.at(i).state() != Qt::TouchPointStationary)
+            if (points.at(i).state() != QEventPoint::Stationary)
                 ++sentPointCount;
         }
 
         for (int i = 0; i < pointCount; ++i) {
             const QTouchEvent::TouchPoint &tp(points.at(i));
             // Stationary points are never sent. They are cached on client side.
-            if (tp.state() == Qt::TouchPointStationary)
+            if (tp.state() == QEventPoint::Stationary)
                 continue;
 
             uint32_t id = tp.id();
             uint32_t state = (tp.state() & 0xFFFF) | (sentPointCount << 16);
-            uint32_t flags = (tp.flags() & 0xFFFF) | (int(event->pointingDevice()->capabilities()) << 16);
+            uint32_t flags = (int(event->pointingDevice()->capabilities()) << 16);
 
             int x = toFixed(tp.position().x());
             int y = toFixed(tp.position().y());
@@ -102,22 +102,6 @@ bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurface *s
             uint32_t pressure = uint32_t(tp.pressure() * 255);
 
             QByteArray rawData;
-            QList<QPointF> rawPosList = tp.rawScreenPositions();
-            int rawPosCount = rawPosList.count();
-            if (rawPosCount) {
-                rawPosCount = qMin(maxRawPos, rawPosCount);
-                QList<float>::iterator iter = m_posData.begin();
-                for (int rpi = 0; rpi < rawPosCount; ++rpi) {
-                    const QPointF &rawPos(rawPosList.at(rpi));
-                    // This will stay in screen coordinates for performance
-                    // reasons, clients using this data will presumably know
-                    // what they are doing.
-                    *iter++ = static_cast<float>(rawPos.x());
-                    *iter++ = static_cast<float>(rawPos.y());
-                }
-                rawData = QByteArray::fromRawData(reinterpret_cast<const char*>(m_posData.constData()), sizeof(float) * rawPosCount * 2);
-            }
-
             send_touch(target->handle,
                        time, id, state,
                        x, y, nx, ny, w, h,
diff --git a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
index 95eb86e6c..e58b2cf85 100644
--- a/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
+++ b/src/hardwareintegration/client/brcm-egl/brcm-egl.pri
@@ -1,7 +1,6 @@
 INCLUDEPATH += $$PWD
 
 QMAKE_USE += egl wayland-client libdl
-QT += egl_support-private
 
 SOURCES += $$PWD/qwaylandbrcmeglintegration.cpp \
            $$PWD/qwaylandbrcmglcontext.cpp \
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
index 31adf100b..c22fa9166 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp
@@ -43,7 +43,7 @@
 #include <QtWaylandClient/private/qwaylandscreen_p.h>
 #include "qwaylandbrcmglcontext.h"
 
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 
 #include <QtGui/QWindow>
 #include <qpa/qwindowsysteminterface.h>
diff --git a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
index 7c115e431..f6029f040 100644
--- a/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
+++ b/src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp
@@ -43,7 +43,7 @@
 #include <QtWaylandClient/private/qwaylandwindow_p.h>
 #include "qwaylandbrcmeglwindow.h"
 
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 
 #include <qpa/qplatformopenglcontext.h>
 #include <QtGui/QSurfaceFormat>
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h
index e9998b832..0f3b505a3 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglinclude.h
@@ -46,6 +46,6 @@
 #include <wayland-egl.h>
 
 #define EGL_EGLEXT_PROTOTYPES
-#include <QtEglSupport/private/qt_egl_p.h>
+#include <QtGui/private/qt_egl_p.h>
 
 #endif // QWAYLANDEGLINCLUDE_H
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
index 7889f575f..1e8dc06f7 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
@@ -42,7 +42,7 @@
 #include <QtWaylandClient/private/qwaylandscreen_p.h>
 #include "qwaylandglcontext.h"
 
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 
 #include <QDebug>
 #include <QtGui/QWindow>
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 8059701d3..3c5f69173 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -47,7 +47,7 @@
 #include "qwaylandeglwindow.h"
 
 #include <QDebug>
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 #include <QtGui/private/qopenglcontext_p.h>
 #include <QtOpenGL/private/qopengltexturecache_p.h>
 #include <QtGui/private/qguiapplication_p.h>
diff --git a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
index 1a80e7cab..0de56607d 100644
--- a/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
+++ b/src/hardwareintegration/client/wayland-egl/wayland-egl.pri
@@ -1,8 +1,8 @@
 INCLUDEPATH += $$PWD
 
-QMAKE_USE += egl wayland-client wayland-egl
+QMAKE_USE += egl wayland-client wayland-egl libdl
 
-QT += egl_support-private opengl-private
+QT += opengl-private
 
 SOURCES += $$PWD/qwaylandeglclientbufferintegration.cpp \
            $$PWD/qwaylandglcontext.cpp \
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
index 104a4df91..1809aa21e 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp
@@ -42,7 +42,7 @@
 #include "qwaylandxcompositeeglwindow.h"
 
 #include <QtCore/QDebug>
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
index a6fead95c..ed739f81a 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QDebug>
 #include <QtGui/QRegion>
 
-#include <QtEglSupport/private/qeglconvenience_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
index e0b70bf21..266c9816a 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h
@@ -44,7 +44,7 @@
 
 #include "qwaylandxcompositeeglclientbufferintegration.h"
 
-#include <QtEglSupport/private/qeglplatformcontext_p.h>
+#include <QtGui/private/qeglplatformcontext_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
index a7377830f..4c6bc7b95 100644
--- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
+++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglwindow.cpp
@@ -40,8 +40,8 @@
 #include "qwaylandxcompositeeglwindow.h"
 #include "qwaylandxcompositebuffer.h"
 
-#include <QtEglSupport/private/qeglconvenience_p.h>
-#include <QtEglSupport/private/qxlibeglintegration_p.h>
+#include <QtGui/private/qeglconvenience_p.h>
+#include <QtGui/private/qxlibeglintegration_p.h>
 
 #include "wayland-xcomposite-client-protocol.h"
 
diff --git a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
index f2beb1e03..ecbaae648 100644
--- a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
+++ b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri
@@ -3,8 +3,6 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri)
 
 QMAKE_USE += egl wayland-client
 
-QT += egl_support-private
-
 SOURCES += \
     $$PWD/qwaylandxcompositeeglcontext.cpp \
     $$PWD/qwaylandxcompositeeglclientbufferintegration.cpp \
diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
index 1bb2f4f7d..edb74a89a 100644
--- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
+++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h
@@ -43,7 +43,7 @@
 #include <qpa/qplatformopenglcontext.h>
 
 #include "qwaylandxcompositeglxintegration.h"
-#include <QtGlxSupport/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri
index 72897d151..b836724fa 100644
--- a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri
+++ b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri
@@ -3,8 +3,6 @@ include ($$PWD/../xcomposite_share/xcomposite_share.pri)
 
 QMAKE_USE += wayland-client libdl
 
-QT += glx_support-private
-
 SOURCES += \
     $$PWD/qwaylandxcompositeglxcontext.cpp \
     $$PWD/qwaylandxcompositeglxintegration.cpp \
diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri
index 4dbbae194..a8baefc98 100644
--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri
+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri
@@ -5,8 +5,6 @@ QMAKE_USE_PRIVATE += egl drm wayland-server
 CONFIG += wayland-scanner
 WAYLANDSERVERSOURCES += $$PWD/../../../3rdparty/protocol/linux-dmabuf-unstable-v1.xml
 
-QT += egl_support-private
-
 SOURCES += \
     $$PWD/linuxdmabufclientbufferintegration.cpp \
     $$PWD/linuxdmabuf.cpp
diff --git a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
index e20c6802c..0a90583be 100644
--- a/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
+++ b/src/hardwareintegration/compositor/wayland-egl/wayland-egl.pri
@@ -2,8 +2,6 @@ INCLUDEPATH += $$PWD
 
 QMAKE_USE_PRIVATE += egl wayland-server wayland-egl
 
-QT += egl_support-private
-
 SOURCES += \
     $$PWD/waylandeglclientbufferintegration.cpp
 
diff --git a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
index 18caed84d..127ea278e 100644
--- a/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
@@ -43,7 +43,7 @@
 #include <QMutex>
 #include <QMutexLocker>
 #include <QtCore/private/qcore_unix_p.h>
-#include <QtEglSupport/private/qeglstreamconvenience_p.h>
+#include <QtGui/private/qeglstreamconvenience_p.h>
 
 #ifndef GL_TEXTURE_EXTERNAL_OES
 #define GL_TEXTURE_EXTERNAL_OES     0x8D65
diff --git a/src/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pri b/src/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pri
index 931475ef6..9d9228e29 100644
--- a/src/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pri
+++ b/src/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pri
@@ -5,8 +5,6 @@ QMAKE_USE_PRIVATE += egl wayland-server wayland-egl
 CONFIG += wayland-scanner
 WAYLANDSERVERSOURCES += $$PWD/../../../3rdparty/protocol/wl-eglstream-controller.xml
 
-QT += egl_support-private
-
 SOURCES += \
     $$PWD/waylandeglstreamintegration.cpp \
     $$PWD/waylandeglstreamcontroller.cpp
diff --git a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp
index 0299ebdcd..b07657c22 100644
--- a/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp
+++ b/src/hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp
@@ -36,7 +36,7 @@
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOffscreenSurface>
 
-#include <QtEglSupport/private/qeglstreamconvenience_p.h>
+#include <QtGui/private/qeglstreamconvenience_p.h>
 #include <qpa/qplatformnativeinterface.h>
 
 #include <QtWaylandCompositor/private/qwaylandcompositor_p.h>
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
diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
index 5ef55ea95..6061fce4d 100644
--- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt
@@ -19,7 +19,6 @@ qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin
         Wayland::Server
     PUBLIC_LIBRARIES
         Qt::CorePrivate
-        Qt::EglSupportPrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt
new file mode 100644
index 000000000..ebaf1ee1d
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt
@@ -0,0 +1,27 @@
+# Generated from wayland-egl.pro.
+
+#####################################################################
+## QWaylandEglClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-wayland-egl
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/wayland-egl
+    LIBRARIES
+        EGL::EGL
+        Wayland::Egl
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+#### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>:
+# OTHER_FILES = "wayland-egl.json"
diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
index f4731abfa..e631743b7 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandEglClientBufferIntegrationPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin
     OUTPUT_NAME qt-wayland-compositor-wayland-egl
@@ -18,7 +19,6 @@ qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin
         Wayland::Server
     PUBLIC_LIBRARIES
         Qt::CorePrivate
-        Qt::EglSupportPrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt
new file mode 100644
index 000000000..3cb4692eb
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt
@@ -0,0 +1,33 @@
+# Generated from wayland-eglstream-controller.pro.
+
+#####################################################################
+## QWaylandEglStreamBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h
+        ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/wayland-eglstream-controller
+    LIBRARIES
+        EGL::EGL
+        Wayland::Egl
+        Wayland::Server
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml
+)
+
+#### Keys ignored in scope 1:.:.:wayland-eglstream-controller.pro:<TRUE>:
+# OTHER_FILES = "wayland-eglstream-controller.json"
diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
index 94ecfc41d..3cbe8f822 100644
--- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandEglStreamBufferIntegrationPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
     OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller
@@ -19,7 +20,6 @@ qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin
         Wayland::Server
     PUBLIC_LIBRARIES
         Qt::CorePrivate
-        Qt::EglSupportPrivate
         Qt::GuiPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt
new file mode 100644
index 000000000..2492b259b
--- /dev/null
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt
@@ -0,0 +1,40 @@
+# Generated from xcomposite-egl.pro.
+
+#####################################################################
+## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin:
+#####################################################################
+
+qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin
+    OUTPUT_NAME qt-wayland-compositor-xcomposite-egl
+    TYPE wayland-graphics-integration-server
+    SOURCES
+        ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h
+        ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h
+        main.cpp
+    INCLUDE_DIRECTORIES
+        ../../../../hardwareintegration/compositor/xcomposite-egl
+        ../../../../hardwareintegration/compositor/xcomposite_share
+    LIBRARIES
+        EGL::EGL
+        Wayland::Server
+        X11::X11
+    PUBLIC_LIBRARIES
+        PkgConfig::XComposite
+        Qt::Core
+        Qt::CorePrivate
+        Qt::Gui
+        Qt::GuiPrivate
+        Qt::WaylandCompositor
+        Qt::WaylandCompositorPrivate
+)
+
+qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin
+    FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml
+)
+
+#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>:
+# OTHER_FILES = "xcomposite-egl.json"
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
index 2492b259b..28a1c155d 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt
@@ -3,6 +3,7 @@
 #####################################################################
 ## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin:
 #####################################################################
+qt_find_package(EGL) # special case
 
 qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin
     OUTPUT_NAME qt-wayland-compositor-xcomposite-egl
diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
index bf96be977..c32b25ba7 100644
--- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt
@@ -17,7 +17,6 @@ qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin
         ../../../../hardwareintegration/compositor/xcomposite-glx
         ../../../../hardwareintegration/compositor/xcomposite_share
     LIBRARIES
-        Qt::GlxSupportPrivate # special case
         Wayland::Server
         X11::X11
     PUBLIC_LIBRARIES
diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt
index 4c6fa7a29..e87767660 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 000000000..e9e5e0b1b
--- /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 dd6bc049d..5c009df87 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 000000000..59382cc0f
--- /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 a4ba2137d..b93637075 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 e027e482b..f41af9f49 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
diff --git a/tests/auto/client/seatv5/tst_seatv5.cpp b/tests/auto/client/seatv5/tst_seatv5.cpp
index a4d4fe4dd..701c5ede9 100644
--- a/tests/auto/client/seatv5/tst_seatv5.cpp
+++ b/tests/auto/client/seatv5/tst_seatv5.cpp
@@ -398,7 +398,7 @@ public:
         {
         }
         QEvent::Type type{};
-        Qt::TouchPointStates touchPointStates{};
+        QEventPoint::States touchPointStates{};
         QList<QTouchEvent::TouchPoint> touchPoints;
     };
     QList<Event> m_events;
diff --git a/tests/auto/client/tabletv2/tst_tabletv2.cpp b/tests/auto/client/tabletv2/tst_tabletv2.cpp
index f52db64f4..3e68e5d1e 100644
--- a/tests/auto/client/tabletv2/tst_tabletv2.cpp
+++ b/tests/auto/client/tabletv2/tst_tabletv2.cpp
@@ -465,11 +465,11 @@ protected:
         case QEvent::TabletEnterProximity:
         case QEvent::TabletLeaveProximity: {
             auto *e = static_cast<QTabletEvent *>(event);
-            auto *ev = new QTabletEvent(e->type(), e->position(), e->globalPosition(), int(e->deviceType()),
-                                        int(e->pointerType()), e->pressure(), e->xTilt(), e->yTilt(),
-                                        e->tangentialPressure(), e->rotation(), e->z(),
-                                        Qt::KeyboardModifier::NoModifier, e->uniqueId(),
-                                        e->button(), e->buttons());
+            auto *ev = new QTabletEvent(e->type(), e->pointingDevice(), e->position(), e->globalPosition(),
+                                     e->pressure(), e->xTilt(), e->yTilt(),
+                                     e->tangentialPressure(), e->rotation(), e->z(),
+                                     Qt::KeyboardModifier::NoModifier,
+                                     e->button(), e->buttons());
             m_events << ev;
             break;
         }
@@ -600,11 +600,11 @@ public:
 
     void tabletEvent(QTabletEvent *e) override
     {
-        m_events << new QTabletEvent(e->type(), e->position(), e->globalPosition(), int(e->deviceType()),
-                                     int(e->pointerType()), e->pressure(), e->xTilt(), e->yTilt(),
+        m_events << new QTabletEvent(e->type(), e->pointingDevice(), e->position(), e->globalPosition(),
+                                     e->pressure(), e->xTilt(), e->yTilt(),
                                      e->tangentialPressure(), e->rotation(), e->z(),
-                                     Qt::KeyboardModifier::NoModifier, e->uniqueId(), e->button(),
-                                     e->buttons());
+                                     Qt::KeyboardModifier::NoModifier,
+                                     e->button(), e->buttons());
         emit tabletEventReceived(m_events.last());
     }
     int nextEventIndex = 0;