Commit 57e0119d authored by Volker Krause's avatar Volker Krause Committed by Vlad Zahorodnii
Browse files

Adapt to Qt6's removal of Qt::X11Extras

parent 45abf173
Pipeline #150818 passed with stage
in 30 minutes and 20 seconds
......@@ -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)
......
......@@ -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)
......@@ -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)
......@@ -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"
......
......@@ -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)
......
......@@ -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()
......
......@@ -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;
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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)
......
......@@ -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)
......
......@@ -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>
......
......@@ -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
{
......
......@@ -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
{
......
......@@ -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
{
......
......@@ -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})
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment