Update version number for 5.26.1

GIT_SILENT

.gitlab-ci.yml

@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: CC0-1.0
 
 include:
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml
   - 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
+  - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml

CMakeLists.txt

@@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "5.25.80")
+set(PROJECT_VERSION "5.26.1")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(CMAKE_C_STANDARD 99)
 
 set(QT_MIN_VERSION "5.15.2")
-set(KF5_MIN_VERSION "5.94")
+set(KF5_MIN_VERSION "5.98.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")
 
 set(CMAKE_CXX_STANDARD 17)

metainfo.yaml

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
 maintainer:
 - vladz
 description: Layer Shell Qt

src/interfaces/window.cpp

@@ -5,11 +5,9 @@
  */
 
 #include "window.h"
-#include "../qwaylandlayersurface_p.h"
-#include "../qwaylandlayershellintegration_p.h"
 #include <layershellqt_logging.h>
-#include <private/qwaylandshellsurface_p.h>
-#include <private/qwaylandwindow_p.h>
+
+#include <QPointer>
 
 using namespace LayerShellQt;
 
@@ -118,23 +116,6 @@ Window::Window(QWindow *window)
     , d(new WindowPrivate(window))
 {
     s_map.insert(d->parentWindow, this);
-
-    //BEGIN Compat mode
-    window->winId();
-    window->setFlag(Qt::BypassWindowManagerHint);
-
-    auto ww = dynamic_cast<QtWaylandClient::QWaylandWindow *>(d->parentWindow->handle());
-    if (!ww) {
-        qCDebug(LAYERSHELLQT) << "window not a wayland window" << d->parentWindow;
-        return;
-    }
-    QWaylandLayerShellIntegration shellIntegration;
-    shellIntegration.initialize(ww->display());
-    shellIntegration.createShellSurface(ww);
-    // we can't block for configure events
-    // a round trip should mean we'll have one by the time we attach the buffer
-    ww->display()->forceRoundTrip();
-    //END compat mode
 }
 
 Window *Window::get(QWindow *window)

src/qwaylandlayersurface.cpp

@@ -37,7 +37,7 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShell *shell, QtWaylandC
     }
     init(shell->get_layer_surface(window->waylandSurface()->object(), output, interface->layer(), interface->scope()));
     connect(interface, &Window::layerChanged, this, [this, interface]() {
-        set_layer(interface->layer());
+        setLayer(interface->layer());
     });
 
     set_anchor(interface->anchors());

tests/main.cpp

@@ -51,8 +51,7 @@ class BasicWindow : public QRasterWindow
 
 int main(int argc, char **argv)
 {
-//    Shell::useLayerShell();
-    qputenv("QT_WAYLAND_USE_BYPASSWINDOWMANAGERHINT", "1");
+    Shell::useLayerShell();
 
     QGuiApplication app(argc, argv);