Update version for new release 6.5.91

Add Window::screenConfiguration() shim
This shim is for 6.6 to maintain compatibility with previous versions. (cherry picked from commit dd76feea81)
2026-05-26 05:28:25 -04:00 · 2026-01-27 20:44:21 +05:30 · 2026-01-21 15:37:16 +02:00 · 2026-01-21 15:37:16 +02:00
3 changed files with 8 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)

 project(layershellqt)
-set(PROJECT_VERSION "6.6.90")
+set(PROJECT_VERSION "6.5.91")
 set(PROJECT_VERSION_MAJOR 6)

 set(CMAKE_C_STANDARD 99)

 set(QT_MIN_VERSION "6.10.0")
-set(KF6_MIN_VERSION "6.24.0")
+set(KF6_MIN_VERSION "6.22.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")

 set(CMAKE_CXX_STANDARD 20)
@@ -37,7 +37,7 @@ include(ECMGenerateExportHeader)
 find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)

 if (Qt6WaylandClient_VERSION VERSION_GREATER_EQUAL "6.10.0")
-    find_package(Qt6WaylandClientPrivate ${QT_MIN_VERSION} REQUIRED NO_MODULE)
+    find_package(Qt6WaylandClientPrivate ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
 endif()

 find_package(WaylandScanner REQUIRED)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,8 +7,11 @@ add_library(LayerShellQtInterface)

 qt6_extract_metatypes(LayerShellQtInterface)

+if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
+    set(private_code_option  "PRIVATE_CODE")
+endif()
 qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface
-    PRIVATE_CODE
+    ${private_code_option}
    FILES
        ${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
        ${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
--- a/src/qwaylandlayersurface.cpp
+++ b/src/qwaylandlayersurface.cpp
@@ -204,7 +204,7 @@ bool QWaylandLayerSurface::requestActivate()
        return true;
    } else {
        const auto focusWindow = QGuiApplication::focusWindow();
-        const auto wlWindow = focusWindow && focusWindow->handle() ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
+        const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
        if (const auto seat = wlWindow->display()->lastInputDevice()) {
            const auto tokenProvider = activation->requestXdgActivationToken(wlWindow->display(), wlWindow->wlSurface(), seat->serial(), QString());
            connect(tokenProvider, &QWaylandXdgActivationTokenV1::done, this, [this](const QString &token) {