Adapt to Qt6's removal of Qt::X11Extras

2022-03-09 17:25:44 +01:00 · 2022-03-09 17:25:44 +01:00 · 57e0119d23
commit 57e0119d23
parent 45abf173f9
25 changed files with 128 additions and 14 deletions
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@ -60,7 +60,6 @@ target_link_libraries(testClientMachine
    Qt::Concurrent
    Qt::Test
    Qt::Widgets
-    Qt::X11Extras

    KF5::ConfigCore
    KF5::WindowSystem
@ -70,6 +69,11 @@ target_link_libraries(testClientMachine

    ${X11_X11_LIB} # to make jenkins happy
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(testClientMachine Qt::X11Extras)
+else()
+    target_link_libraries(testClientMachine Qt::GuiPrivate)
+endif()
 add_test(NAME kwin-testClientMachine COMMAND testClientMachine)
 ecm_mark_as_test(testClientMachine)

@ -84,13 +88,17 @@ add_executable(testXcbWrapper ${testXcbWrapper_SRCS})
 target_link_libraries(testXcbWrapper
    Qt::Test
    Qt::Widgets
-    Qt::X11Extras

    KF5::ConfigCore
    KF5::WindowSystem

    XCB::XCB
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(testXcbWrapper Qt::X11Extras)
+else()
+    target_link_libraries(testXcbWrapper Qt::GuiPrivate)
+endif()
 add_test(NAME kwin-testXcbWrapper COMMAND testXcbWrapper)
 ecm_mark_as_test(testXcbWrapper)

@ -100,7 +108,6 @@ if (XCB_ICCCM_FOUND)
    target_link_libraries(testXcbSizeHints
        Qt::Test
        Qt::Widgets
-        Qt::X11Extras

        KF5::ConfigCore
        KF5::WindowSystem
@ -108,6 +115,11 @@ if (XCB_ICCCM_FOUND)
        XCB::ICCCM
        XCB::XCB
    )
+    if (QT_MAJOR_VERSION EQUAL "5")
+        target_link_libraries(testXcbSizeHints Qt::X11Extras)
+    else()
+        target_link_libraries(testXcbSizeHints Qt::GuiPrivate)
+    endif()
    add_test(NAME kwin-testXcbSizeHints COMMAND testXcbSizeHints)
    ecm_mark_as_test(testXcbSizeHints)
 endif()
@ -123,13 +135,17 @@ add_executable(testXcbWindow ${testXcbWindow_SRCS})
 target_link_libraries(testXcbWindow
    Qt::Test
    Qt::Widgets
-    Qt::X11Extras

    KF5::ConfigCore
    KF5::WindowSystem

    XCB::XCB
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(testXcbWindow Qt::X11Extras)
+else()
+    target_link_libraries(testXcbWindow Qt::GuiPrivate)
+endif()
 add_test(NAME kwin-testXcbWindow COMMAND testXcbWindow)
 ecm_mark_as_test(testXcbWindow)

--- a/autotests/libkwineffects/CMakeLists.txt
+++ b/autotests/libkwineffects/CMakeLists.txt
@ -16,5 +16,8 @@ kwineffects_unit_tests(

 add_executable(kwinglplatformtest kwinglplatformtest.cpp mock_gl.cpp ../../src/libkwineffects/kwinglplatform.cpp)
 add_test(NAME kwineffects-kwinglplatformtest COMMAND kwinglplatformtest)
-target_link_libraries(kwinglplatformtest Qt::Test Qt::Gui Qt::X11Extras KF5::ConfigCore XCB::XCB)
+target_link_libraries(kwinglplatformtest Qt::Test Qt::Gui KF5::ConfigCore XCB::XCB)
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(kwinglplatformtest Qt::X11Extras)
+endif()
 ecm_mark_as_test(kwinglplatformtest)
--- a/autotests/libxrenderutils/CMakeLists.txt
+++ b/autotests/libxrenderutils/CMakeLists.txt
@ -5,9 +5,13 @@ target_link_libraries(blendPictureTest
    kwinxrenderutils
    Qt::Test
    Qt::Gui
-    Qt::X11Extras
    XCB::XCB
    XCB::RENDER
    XCB::XFIXES
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(blendPictureTest Qt::X11Extras)
+else()
+    target_link_libraries(blendPictureTest Qt::GuiPrivate)
+endif()
 ecm_mark_as_test(blendPictureTest)
--- a/autotests/libxrenderutils/blendpicture_test.cpp
+++ b/autotests/libxrenderutils/blendpicture_test.cpp
@ -8,7 +8,11 @@
 */
 #include <QtTest>
 #include <QLoggingCategory>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 #include "../testutils.h"

--- a/autotests/tabbox/CMakeLists.txt
+++ b/autotests/tabbox/CMakeLists.txt
@ -22,7 +22,6 @@ target_link_libraries(testTabBoxClientModel
    Qt::Quick
    Qt::Test
    Qt::Widgets
-    Qt::X11Extras
    Qt::GuiPrivate

    KF5::ConfigCore
@ -32,6 +31,9 @@ target_link_libraries(testTabBoxClientModel

    XCB::XCB
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(testTabBoxClientModel Qt::X11Extras)
+endif()
 add_test(NAME kwin-testTabBoxClientModel COMMAND testTabBoxClientModel)
 ecm_mark_as_test(testTabBoxClientModel)

@ -57,7 +59,6 @@ target_link_libraries(testTabBoxHandler
    Qt::Quick
    Qt::Test
    Qt::Widgets
-    Qt::X11Extras
    Qt::GuiPrivate

    KF5::ConfigCore
@ -67,6 +68,9 @@ target_link_libraries(testTabBoxHandler

    XCB::XCB
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(testTabBoxHandler Qt::X11Extras)
+endif()
 add_test(NAME kwin-testTabBoxHandler COMMAND testTabBoxHandler)
 ecm_mark_as_test(testTabBoxHandler)

--- a/autotests/tabbox/test_tabbox_clientmodel.cpp
+++ b/autotests/tabbox/test_tabbox_clientmodel.cpp
@ -12,7 +12,11 @@
 #include "../testutils.h"

 #include <QtTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 using namespace KWin;

 void TestTabBoxClientModel::initTestCase()
--- a/autotests/tabbox/test_tabbox_handler.cpp
+++ b/autotests/tabbox/test_tabbox_handler.cpp
@ -10,7 +10,11 @@
 #include "clientmodel.h"
 #include "../testutils.h"
 #include <QtTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 using namespace KWin;

--- a/autotests/test_client_machine.cpp
+++ b/autotests/test_client_machine.cpp
@ -13,7 +13,11 @@
 // Qt
 #include <QApplication>
 #include <QtTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 // xcb
 #include <xcb/xcb.h>
 // system
--- a/autotests/test_x11_timestamp_update.cpp
+++ b/autotests/test_x11_timestamp_update.cpp
@ -8,7 +8,11 @@
 */

 #include <QTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 #include <KPluginMetaData>

--- a/autotests/test_xcb_size_hints.cpp
+++ b/autotests/test_xcb_size_hints.cpp
@ -12,7 +12,11 @@
 // Qt
 #include <QApplication>
 #include <QtTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 #include <netwm.h>
 // xcb
 #include <xcb/xcb.h>
--- a/autotests/test_xcb_window.cpp
+++ b/autotests/test_xcb_window.cpp
@ -12,7 +12,11 @@
 // Qt
 #include <QApplication>
 #include <QtTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 // xcb
 #include <xcb/xcb.h>

--- a/autotests/test_xcb_wrapper.cpp
+++ b/autotests/test_xcb_wrapper.cpp
@ -12,7 +12,11 @@
 // Qt
 #include <QApplication>
 #include <QtTest>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 #include <netwm.h>
 // xcb
 #include <xcb/xcb.h>
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -288,8 +288,10 @@ add_executable(kwin_x11 main_x11.cpp)
 target_link_libraries(kwin_x11
    kwin
    KF5::Crash
-    Qt::X11Extras
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(kwin_x11 Qt::X11Extras)
+endif()
 kcoreaddons_target_static_plugins(kwin_x11 "kwin/effects/plugins")

 install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
--- a/src/backends/x11/standalone/CMakeLists.txt
+++ b/src/backends/x11/standalone/CMakeLists.txt
@ -17,7 +17,10 @@ set(X11PLATFORM_SOURCES

 add_library(KWinX11Platform MODULE ${X11PLATFORM_SOURCES})
 set_target_properties(KWinX11Platform PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org.kde.kwin.platforms/")
-target_link_libraries(KWinX11Platform eglx11common kwin kwinxrenderutils Qt::X11Extras KF5::Crash X11::X11)
+target_link_libraries(KWinX11Platform eglx11common kwin kwinxrenderutils KF5::Crash X11::X11)
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(KWinX11Platform Qt::X11Extras)
+endif()
 if (X11_Xi_FOUND)
    target_sources(KWinX11Platform PRIVATE xinputintegration.cpp)
    target_link_libraries(KWinX11Platform X11::Xi)
--- a/src/backends/x11/standalone/glxbackend.cpp
+++ b/src/backends/x11/standalone/glxbackend.cpp
@ -38,7 +38,11 @@
 // Qt
 #include <QDebug>
 #include <QOpenGLContext>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 #include <QtPlatformHeaders/QGLXNativeContext>
 // system
 #include <unistd.h>
--- a/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp
+++ b/src/backends/x11/standalone/omlsynccontrolvsyncmonitor.cpp
@ -8,7 +8,11 @@
 #include "glxconvenience.h"
 #include "logging.h"

+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 namespace KWin
 {
--- a/src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp
+++ b/src/backends/x11/standalone/sgivideosyncvsyncmonitor.cpp
@ -8,7 +8,11 @@
 #include "glxconvenience.h"
 #include "logging.h"

+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 namespace KWin
 {
--- a/src/backends/x11/standalone/x11_platform.cpp
+++ b/src/backends/x11/standalone/x11_platform.cpp
@ -42,7 +42,11 @@

 #include <QThread>
 #include <QOpenGLContext>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 namespace KWin
 {
--- a/src/helpers/killer/CMakeLists.txt
+++ b/src/helpers/killer/CMakeLists.txt
@ -9,7 +9,11 @@ target_link_libraries(kwin_killer_helper
    KF5::I18n
    KF5::WidgetsAddons
    Qt::Widgets
-    Qt::X11Extras
 )
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(kwin_killer_helper Qt::X11Extras)
+else()
+    target_link_libraries(kwin_killer_helper Qt::GuiPrivate)
+endif()

 install(TARGETS kwin_killer_helper DESTINATION ${KDE_INSTALL_LIBEXECDIR})
--- a/src/helpers/killer/killer.cpp
+++ b/src/helpers/killer/killer.cpp
@ -17,7 +17,11 @@
 #include <QCommandLineParser>
 #include <QDebug>
 #include <QProcess>
-#include <QtX11Extras/QX11Info>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
+#include <QX11Info>
+#endif
 #include <xcb/xcb.h>

 #include <cerrno>
--- a/src/main_x11.cpp
+++ b/src/main_x11.cpp
@ -34,7 +34,11 @@
 #include <QPushButton>
 #include <QSurfaceFormat>
 #include <QVBoxLayout>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif
 #include <QtDBus>

 // system
--- a/src/platform.cpp
+++ b/src/platform.cpp
@ -28,7 +28,11 @@
 #include <KWaylandServer/outputconfiguration_v2_interface.h>
 #include <KWaylandServer/outputchangeset_v2.h>

+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 #include <cerrno>

--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -7,11 +7,21 @@ endif()
 # next target
 set(screenedgeshowtest_SRCS screenedgeshowtest.cpp)
 add_executable(screenedgeshowtest ${screenedgeshowtest_SRCS})
-target_link_libraries(screenedgeshowtest Qt::Widgets Qt::X11Extras KF5::ConfigCore KF5::WindowSystem KF5::WaylandClient ${XCB_XCB_LIBRARY})
+target_link_libraries(screenedgeshowtest Qt::Widgets KF5::ConfigCore KF5::WindowSystem KF5::WaylandClient ${XCB_XCB_LIBRARY})
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(screenedgeshowtest Qt::X11Extras)
+else()
+    target_link_libraries(screenedgeshowtest Qt::GuiPrivate)
+endif()
 target_include_directories(screenedgeshowtest PRIVATE ${CMAKE_SOURCE_DIR}/src)

 add_executable(x11shadowreader x11shadowreader.cpp)
-target_link_libraries(x11shadowreader XCB::XCB Qt::Widgets Qt::X11Extras KF5::ConfigCore KF5::WindowSystem)
+target_link_libraries(x11shadowreader XCB::XCB Qt::Widgets KF5::ConfigCore KF5::WindowSystem)
+if (QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries(x11shadowreader Qt::X11Extras)
+else()
+    target_link_libraries(x11shadowreader Qt::GuiPrivate)
+endif()
 target_include_directories(x11shadowreader PRIVATE ${CMAKE_SOURCE_DIR}/src)

 add_executable(pointerconstraints pointerconstraintstest.cpp)
--- a/tests/screenedgeshowtest.cpp
+++ b/tests/screenedgeshowtest.cpp
@ -16,7 +16,11 @@
 #include <QWindow>
 #include <QWidget>
 #include <QCheckBox>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 #include <KWindowSystem>

--- a/tests/x11shadowreader.cpp
+++ b/tests/x11shadowreader.cpp
@ -12,7 +12,11 @@
 #include <QFormLayout>
 #include <QVBoxLayout>
 #include <QWidget>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
 #include <QX11Info>
+#endif

 static QVector<uint32_t> readShadow(quint32 windowId)
 {