Adapt to Qt6's removal of Qt::X11Extras

applets/kimpanel/backend/ibus/emojier/app/CMakeLists.txt

@@ -2,6 +2,8 @@ add_executable(ibus-ui-emojier-plasma emojier.cpp resources.qrc)
 target_link_libraries(ibus-ui-emojier-plasma Qt::Widgets Qt::Quick KF5::ConfigGui KF5::I18n KF5::CoreAddons KF5::Crash KF5::DBusAddons KF5::WindowSystem)
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(ibus-ui-emojier-plasma Qt::X11Extras)
+else()
+    target_link_libraries(ibus-ui-emojier-plasma Qt::GuiPrivate)
 endif()
 
 install(TARGETS ibus-ui-emojier-plasma ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

applets/kimpanel/backend/ibus/emojier/app/emojier.cpp

@@ -26,7 +26,11 @@
 #include <QQuickWindow>
 #include <QSessionManager>
 #include <QVector>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include "config-workspace.h"
 #include <kstartupinfo.h>

applets/kimpanel/backend/ibus/ibus15/app.cpp

@@ -11,7 +11,11 @@
 #include <QDBusServiceWatcher>
 #include <QDebug>
 #include <QTimer>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #define USED_MASK (XCB_MOD_MASK_SHIFT | XCB_MOD_MASK_CONTROL | XCB_MOD_MASK_1 | XCB_MOD_MASK_4)
 

applets/pager/CMakeLists.txt

@@ -22,6 +22,8 @@ target_link_libraries(pagerplugin
 if (X11_FOUND)
     if (QT_MAJOR_VERSION EQUAL "5")
         target_link_libraries(pagerplugin Qt::X11Extras)
+    else()
+        target_link_libraries(pagerplugin Qt::GuiPrivate)
     endif()
 endif()
 

applets/pager/plugin/pagermodel.h

@@ -8,15 +8,19 @@
 
 #include <config-X11.h>
 
+#include <QAbstractListModel>
+#include <QQmlParserStatus>
+#include <qwindowdefs.h>
+
 #if HAVE_X11
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 #include <netwm.h>
 #endif
 
-#include <QAbstractListModel>
-#include <QQmlParserStatus>
-#include <qwindowdefs.h>
-
 class QMimeData;
 
 class PagerModel : public QAbstractListModel, public QQmlParserStatus

kaccess/CMakeLists.txt

@@ -23,6 +23,8 @@ target_link_libraries(kaccess
 )
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(kaccess Qt::X11Extras)
+else()
+    target_link_libraries(kaccess Qt::GuiPrivate)
 endif()
 
 install(TARGETS kaccess ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

kaccess/kaccess.cpp

@@ -42,7 +42,11 @@
 #define XK_XKB_KEYS
 #include <X11/keysymdef.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include <QLoggingCategory>
 

kaccess/main.cpp

@@ -14,7 +14,11 @@
 #endif
 #include <QApplication>
 #include <QDebug>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 int main(int argc, char *argv[])
 {

kcms/access/CMakeLists.txt

@@ -36,6 +36,8 @@ target_link_libraries(kcm_access
 )
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(kcm_access Qt::X11Extras)
+else()
+    target_link_libraries(kcm_access Qt::GuiPrivate)
 endif()
 
 install(FILES kcm_access.desktop  DESTINATION ${KDE_INSTALL_APPDIR})

kcms/access/kcmaccess.cpp

@@ -16,7 +16,11 @@
 #include <QQuickRenderControl>
 #include <QStandardPaths>
 #include <QWindow>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include <KConfigGroup>
 #include <KKeyServer>

kcms/keyboard/CMakeLists.txt

@@ -61,6 +61,8 @@ target_link_libraries(kded_keyboard
  )
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(kded_keyboard Qt5::X11Extras)
+else()
+    target_link_libraries(kded_keyboard Qt::GuiPrivate)
 endif()
 
 if (HAVE_XINPUT)
@@ -134,6 +136,8 @@ target_link_libraries(kcm_keyboard_static
 )
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(kcm_keyboard_static Qt5::X11Extras)
+else()
+    target_link_libraries(kcm_keyboard_static Qt::GuiPrivate)
 endif()
 
 kcoreaddons_add_plugin(kcm_keyboard SOURCES kcmmain.cpp INSTALL_NAMESPACE "plasma/kcms/systemsettings")

kcms/keyboard/kcm_keyboard_widget.cpp

@@ -20,7 +20,11 @@
 #include <QPixmap>
 #include <QVBoxLayout>
 #include <QWidget>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include "keyboard_config.h"
 #include "workspace_options.h"

kcms/keyboard/kcmmisc.cpp

@@ -20,7 +20,11 @@
 #include <QDoubleSpinBox>
 #include <QSpinBox>
 #include <QWhatsThis>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include <KConfig>
 #include <KConfigGroup>

kcms/keyboard/keyboard_daemon.cpp

@@ -12,7 +12,6 @@
 #include <QDBusMessage>
 #include <QDBusPendingCall>
 #include <QProcess>
-#include <QX11Info>
 
 #include <KPluginFactory>
 

kcms/keyboard/keyboard_hardware.cpp

@@ -9,7 +9,11 @@
 #include <KSharedConfig>
 
 #include <QDebug>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include <math.h>
 

kcms/keyboard/layout_memory.cpp

@@ -7,7 +7,6 @@
 #include "layout_memory.h"
 #include "debug.h"
 
-#include <QX11Info>
 
 #include <KWindowSystem>
 

kcms/keyboard/tastenbrett/CMakeLists.txt

@@ -33,6 +33,8 @@ target_link_libraries(tastenbrett
 )
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(tastenbrett PRIVATE Qt5::X11Extras)
+else()
+    target_link_libraries(tastenbrett PRIVATE Qt::GuiPrivate)
 endif()
 
 install(TARGETS tastenbrett DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

kcms/keyboard/tastenbrett/doodad.cpp

@@ -7,7 +7,11 @@
 #include "doodad.h"
 
 #include <QKeyEvent>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include "application.h"
 #include "shape.h"

kcms/keyboard/tastenbrett/main.cpp

@@ -9,7 +9,11 @@
 #include <QProcess>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QX11Info>
+#else
+#include <QtGui/private/qtx11extras_p.h>
+#endif
 
 #include <KAboutData>
 #include <KLocalizedString>

kcms/keyboard/tests/CMakeLists.txt

@@ -15,6 +15,8 @@ macro(KEYBOARD_DAEMON_UNIT_TESTS _testname)
                )
                if (QT_MAJOR_VERSION EQUAL "5")
                   target_link_libraries(${_testname}_test Qt5::X11Extras)
+               else()
+                  target_link_libraries(${_testname}_test Qt::GuiPrivate)
                endif()
 endmacro(KEYBOARD_DAEMON_UNIT_TESTS)