Compare commits

...

5 Commits

Author SHA1 Message Date
Bhushan Shah
ba986ea573 Update version for new release 6.6.90 2026-05-14 13:30:54 +05:30
Bhushan Shah
8be764bb9a Update Frameworks version requirement to 6.24.0
GIT_SILENT
2026-05-14 12:40:04 +05:30
Vlad Zahorodnii
aac600107a Fix spectacle crash
focusWindow may have no platform window.
2026-03-26 10:25:05 +00:00
Laurent Montel
9c02b52291 fix cmake warnings 2026-03-22 11:54:02 +01:00
David Redondo
15f108b536 Remove unneeded Qt version check 2026-03-02 10:46:31 +01:00
3 changed files with 5 additions and 8 deletions

View File

@@ -4,13 +4,13 @@
cmake_minimum_required(VERSION 3.16)
project(layershellqt)
set(PROJECT_VERSION "6.6.80")
set(PROJECT_VERSION "6.6.90")
set(PROJECT_VERSION_MAJOR 6)
set(CMAKE_C_STANDARD 99)
set(QT_MIN_VERSION "6.10.0")
set(KF6_MIN_VERSION "6.22.0")
set(KF6_MIN_VERSION "6.24.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 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(Qt6WaylandClientPrivate ${QT_MIN_VERSION} REQUIRED NO_MODULE)
endif()
find_package(WaylandScanner REQUIRED)

View File

@@ -7,11 +7,8 @@ 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_option}
PRIVATE_CODE
FILES
${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml

View File

@@ -204,7 +204,7 @@ bool QWaylandLayerSurface::requestActivate()
return true;
} else {
const auto focusWindow = QGuiApplication::focusWindow();
const auto wlWindow = focusWindow ? static_cast<QtWaylandClient::QWaylandWindow *>(focusWindow->handle()) : window();
const auto wlWindow = focusWindow && focusWindow->handle() ? 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) {