Finalize the Qt6/KF6 port and add Qt6 CI

.gitlab-ci.yml

@@ -4,3 +4,4 @@
 include:
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
   - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml

src/idletime/poller.h

@@ -6,7 +6,7 @@
 #ifndef POLLER_H
 #define POLLER_H
 
-#include <KIdleTime/private/abstractsystempoller.h>
+#include <private/abstractsystempoller.h>
 
 #include <QHash>
 

src/windowsystem/CMakeLists.txt

@@ -40,12 +40,12 @@ target_link_libraries(KF5WindowSystemKWaylandPlugin
     Qt::Widgets
     Wayland::Client
     Qt::WaylandClient
+    Qt::WaylandClientPrivate
     PkgConfig::XKBCommon
 )
 
 if (QT_MAJOR_VERSION EQUAL "5")
     target_link_libraries(KF5WindowSystemKWaylandPlugin
-        Qt::WaylandClientPrivate
         Qt::XkbCommonSupportPrivate
     )
 endif()

src/windowsystem/plugin.h

@@ -6,7 +6,7 @@
 #ifndef KWINDOWSYSTEM_KWAYLAND_PLUGIN_H
 #define KWINDOWSYSTEM_KWAYLAND_PLUGIN_H
 
-#include <KWindowSystem/private/kwindowsystemplugininterface_p.h>
+#include <private/kwindowsystemplugininterface_p.h>
 
 class KWaylandPlugin : public KWindowSystemPluginInterface
 {

src/windowsystem/waylandintegration.cpp

@@ -22,7 +22,7 @@
 #include <KWayland/Client/slide.h>
 #include <KWayland/Client/surface.h>
 
-#include <KWindowSystem/KWindowSystem>
+#include <KWindowSystem>
 
 #include "waylandxdgactivationv1_p.h"
 #include <QGuiApplication>

src/windowsystem/waylandintegration.h

@@ -7,7 +7,7 @@
 */
 #ifndef WAYLANDINTEGRATION_H
 #define WAYLANDINTEGRATION_H
-#include <KWindowSystem/private/kwindoweffects_p.h>
+#include <private/kwindoweffects_p.h>
 
 #include <QPointer>
 

src/windowsystem/windoweffects.h

@@ -6,10 +6,11 @@
 */
 #ifndef WINDOWEFFECTS_H
 #define WINDOWEFFECTS_H
-#include <KWindowSystem/private/kwindoweffects_p.h>
 #include <kwindowsystem_version.h>
+#include <private/kwindoweffects_p.h>
 
 #include <QHash>
+#include <QObject>
 
 namespace KWayland
 {

src/windowsystem/windowinfo.h

@@ -7,8 +7,8 @@
 #ifndef WINDOWINFO_H
 #define WINDOWINFO_H
 
-#include <KWindowSystem/private/kwindowinfo_p.h>
 #include <kwindowinfo.h>
+#include <private/kwindowinfo_p.h>
 
 namespace KWayland
 {

src/windowsystem/windowshadow.h

@@ -9,7 +9,7 @@
 
 #include <KWayland/Client/buffer.h>
 #include <KWayland/Client/shadow.h>
-#include <KWindowSystem/private/kwindowshadow_p.h>
+#include <private/kwindowshadow_p.h>
 
 class WindowShadowTile final : public KWindowShadowTilePrivate
 {

src/windowsystem/windowsystem.cpp

@@ -8,7 +8,7 @@
 #include "waylandintegration.h"
 #include "waylandxdgactivationv1_p.h"
 
-#include <KWindowSystem/KWindowSystem>
+#include <KWindowSystem>
 
 #include <KWayland/Client/connection_thread.h>
 #include <KWayland/Client/plasmashell.h>

src/windowsystem/windowsystem.h

@@ -6,7 +6,7 @@
 #ifndef WINDOWSYSTEM_H
 #define WINDOWSYSTEM_H
 
-#include <KWindowSystem/private/kwindowsystem_p.h>
+#include <private/kwindowsystem_p.h>
 
 #include <QObject>