Update version number for 5.27.11

GIT_SILENT
Port to new Gitlab template include format
2025-07-14 11:04:20 -04:00 · 2024-03-06 11:18:07 +00:00 · 2024-01-12 20:15:45 +01:00 · 2023-12-05 19:10:02 +00:00 · 2023-10-24 12:42:13 +01:00 · 2023-09-12 11:22:08 +01:00
3 changed files with 23 additions and 10 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -2,8 +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
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/reuse-lint.yml
+      - /gitlab-templates/linux.yml
+      - /gitlab-templates/freebsd.yml
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -4,13 +4,13 @@
 cmake_minimum_required(VERSION 3.16)

 project(layershellqt)
-set(PROJECT_VERSION "5.26.0")
+set(PROJECT_VERSION "5.27.11")
 set(PROJECT_VERSION_MAJOR 5)

 set(CMAKE_C_STANDARD 99)

 set(QT_MIN_VERSION "5.15.2")
-set(KF5_MIN_VERSION "5.98.0")
+set(KF5_MIN_VERSION "5.102.0")
 set(KDE_COMPILERSETTINGS_LEVEL "5.82")

 set(CMAKE_CXX_STANDARD 17)
@ -23,6 +23,7 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMSetupVersion)
+include(ECMDeprecationSettings)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
@ -30,6 +31,7 @@ include(GenerateExportHeader)
 include(KDEClangFormat)
 include(ECMQtDeclareLoggingCategory)

+
 find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient Qml)
 if (QT_MAJOR_VERSION EQUAL "5")
    find_package(Qt5XkbCommonSupport REQUIRED PRIVATE)
@ -53,10 +55,15 @@ ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX LAYERSHELLQT

 file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h)
 kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+
+ecm_set_disabled_deprecation_versions(QT 5.15.2
+    KF 5.101
+)
+
 add_subdirectory(src)
 add_subdirectory(tests)

-set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_LIBDIR}/cmake/LayerShellQt)
+set(CMAKECONFIG_INSTALL_DIR ${KDE_INSTALL_CMAKEPACKAGEDIR}/LayerShellQt)
 install(EXPORT LayerShellQtTargets
        NAMESPACE LayerShellQt::
        DESTINATION ${CMAKECONFIG_INSTALL_DIR}
--- a/src/interfaces/window.cpp
+++ b/src/interfaces/window.cpp
@ -8,6 +8,7 @@
 #include <layershellqt_logging.h>

 #include <QPointer>
+#include <optional>

 using namespace LayerShellQt;

@ -26,7 +27,7 @@ public:
    Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityExclusive;
    Window::Layer layer = Window::LayerTop;
    QMargins margins;
-    QPointer<QScreen> desiredOutput;
+    std::optional<QPointer<QScreen>> desiredOutput;
 };

 static QMap<QWindow *, Window *> s_map;
@ -103,7 +104,12 @@ Window::Layer Window::layer() const

 QScreen *Window::desiredOutput() const
 {
-    return d->desiredOutput;
+    // Don't use .value_or here to avoid a temporary QPointer
+    if (d->desiredOutput.has_value()) {
+        return d->desiredOutput.value();
+    }
+
+    return d->parentWindow->screen();
 }

 void Window::setDesiredOutput(QScreen *output)
Author	SHA1	Message	Date
Jonathan Riddell	fd588d520b	Update version number for 5.27.11 GIT_SILENT	2024-03-06 11:18:07 +00:00
Volker Krause	204645bae9	Port to new Gitlab template include format	2024-01-12 20:15:45 +01:00
Jonathan Esk-Riddell	de99581bae	Update version number for 5.27.10 GIT_SILENT	2023-12-05 19:10:02 +00:00
Jonathan Esk-Riddell	99aa6c62a7	Update version number for 5.27.9 GIT_SILENT	2023-10-24 12:42:13 +01:00
Jonathan Esk-Riddell	a09d4c532d	Update version number for 5.27.8 GIT_SILENT	2023-09-12 11:22:08 +01:00
Jonathan Esk-Riddell	ee7ccc4fb8	Update version number for 5.27.7 GIT_SILENT	2023-08-01 10:03:25 +01:00
Jonathan Esk-Riddell	d610813bac	Update version number for 5.27.6 GIT_SILENT	2023-06-20 14:02:45 +01:00
Jonathan Esk-Riddell	debc455bd5	Update version number for 5.27.5 GIT_SILENT	2023-05-09 12:18:32 +01:00
Jonathan Esk-Riddell	b2dcb1acff	Update version number for 5.27.4 GIT_SILENT	2023-04-04 11:21:08 +01:00
Jonathan Esk-Riddell	94eb90d823	Update version number for 5.27.3 GIT_SILENT	2023-03-14 11:53:20 +00:00
Jonathan Esk-Riddell	dac784828f	Update version number for 5.27.2 GIT_SILENT	2023-02-28 12:01:30 +00:00
Fabian Vogt	ddc4aead87	Use the QScreen of the QWindow as default output If the Window::setDesiredOutput API was not called for the QWindow, use QWindow::screen(). This allows assigning QWindows to specific screens using the plain Qt API. Passing nullptr to Window::setDesiredOutput explicitly results in nil as desired output for the layer, which lets the compositor select a screen. (cherry picked from commit `3c85e2e889`)	2023-02-23 09:38:55 +01:00
Jonathan Esk-Riddell	7a862bdcd4	Update version number for 5.27.1 GIT_SILENT	2023-02-21 11:05:04 +00:00
Jonathan Esk-Riddell	b758105bd7	Update version number for 5.27.0 GIT_SILENT	2023-02-09 11:41:27 +00:00
Jonathan Esk-Riddell	79441811ff	Update kf5 version requirement to 5.102.0 GIT_SILENT	2023-01-21 20:17:53 +00:00
Jonathan Esk-Riddell	fc06e945c8	Update version number for 5.26.90 GIT_SILENT	2023-01-19 11:17:24 +00:00
Laurent Montel	b95910c086	Use ecm_set_disabled_deprecation_versions	2022-12-23 13:50:51 +01:00
Friedrich W. H. Kossebau	70dc87f673	Use KDE_INSTALL_CMAKEPACKAGEDIR GIT_SILENT	2022-10-22 13:59:13 +00:00
Jonathan Esk-Riddell	7b9c2c1db1	Update version number for 5.26.80 GIT_SILENT	2022-09-15 13:57:50 +01:00