Commit 2a8b97f2 authored by Volker Krause's avatar Volker Krause
Browse files

Adapt to QtX11Extras being gone in Qt6

parent cb325590
Pipeline #167396 passed with stage
in 1 minute and 59 seconds
......@@ -108,7 +108,12 @@ if(HAVE_WIRELESS_SUPPORT)
endif()
if (XCB_FOUND) # kwin kscreen helper effect
target_link_libraries(powerdevilcore Qt::X11Extras XCB::XCB)
target_link_libraries(powerdevilcore XCB::XCB)
if (QT_MAJOR_VERSION EQUAL "5")
target_link_libraries(powerdevilcore Qt5::X11Extras)
else()
target_link_libraries(powerdevilcore Qt::GuiPrivate)
endif()
endif ()
# target no.2 - powerdevil kded module
......@@ -152,7 +157,11 @@ target_link_libraries(powerdevil
powerdevilcore
)
if (XCB_FOUND)
target_link_libraries(powerdevil Qt::X11Extras)
if (QT_MAJOR_VERSION EQUAL "5")
target_link_libraries(powerdevil Qt5::X11Extras)
else()
target_link_libraries(powerdevil Qt::GuiPrivate)
endif()
endif ()
target_link_libraries(powerdevil ${UDEV_LIBS})
......
......@@ -33,7 +33,11 @@
#include <QDBusMessage>
#include <QDBusPendingCall>
#include <QGuiApplication>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QX11Info>
#else
#include <private/qtx11extras_p.h>
#endif
#include <QTimer>
#include <QDebug>
......
......@@ -26,7 +26,11 @@
#include <kwinkscreenhelpereffect.h>
// Qt
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QX11Info>
#else
#include <private/qtx11extras_p.h>
#endif
// xcb
#include <xcb/dpms.h>
......
......@@ -20,7 +20,11 @@
#include "kwinkscreenhelpereffect.h"
#include <QCoreApplication>
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QX11Info>
#else
#include <private/qtx11extras_p.h>
#endif
#include <chrono>
using namespace std::chrono_literals;
......
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