Fix includes for QX11Info when using Qt6

events/x11/x11events.cpp

@@ -22,7 +22,6 @@
 #include "x11events.h"
 
 #include <QApplication>
-#include <QX11Info>
 #include <QDesktopWidget>
 #include <QGlobalStatic>
 
@@ -30,7 +29,11 @@
 #include <X11/keysym.h>
 #include <X11/extensions/XTest.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 enum {
     LEFTSHIFT = 1,

events/x11/x11eventsplugin.cpp

@@ -22,7 +22,12 @@
 #include "x11events.h"
 
 #include <KPluginFactory>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 K_PLUGIN_CLASS(X11EventsPlugin)
 

framebuffers/xcb/xcb_framebuffer.cpp

@@ -18,12 +18,16 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
-#include <QX11Info>
 #include <QCoreApplication>
 #include <QGuiApplication>
 #include <QScreen>
 #include <QAbstractNativeEventFilter>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 class KrfbXCBEventFilter: public QAbstractNativeEventFilter
 {

krfb/main.cpp

@@ -30,7 +30,12 @@
 
 #include <QPixmap>
 #include <qwindowdefs.h>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include <csignal>
 #include <X11/extensions/XTest.h>

krfb/rfbserver.cpp

@@ -24,7 +24,12 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QPointer>
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 struct RfbServer::Private
 {