Compare commits

...

17 Commits

Author SHA1 Message Date
09eb3e8196 update version for new release 2025-04-02 05:17:01 +01:00
9f83b5177d update version for new release 2025-03-11 14:32:37 +00:00
7ed94f9246 update version for new release 2025-02-25 16:45:49 +00:00
aa4cfaf37e update version for new release 2025-02-18 14:21:38 +00:00
d44f84a8da update version for new release 2025-02-12 15:47:58 +00:00
a0923de84d update version for new release 2025-02-06 10:41:35 +00:00
5dccaf1b84 update version for new release 2025-01-23 11:55:19 +00:00
c85d6e7baa update version for new release 2025-01-09 11:01:05 +00:00
e534206172 Update Frameworks version requirement to 6.10.0
GIT_SILENT
2025-01-09 10:29:52 +00:00
edb8f67b1b It compiles without deprecated methods 2024-12-18 13:24:21 +01:00
1796255496 update version for new release 2024-10-03 13:11:32 +01:00
2dbd1d6eb7 Update Frameworks version requirement to 6.5.0
GIT_SILENT
2024-09-12 11:08:45 +01:00
0d11058c8f update version for new release 2024-09-12 10:50:16 +01:00
a5fbaa5975 Reformat CMake code for better readability 2024-08-14 11:08:41 +02:00
6f8a3f5d42 Generate wayland code with PRIVATE_CODE 2024-08-14 10:47:07 +02:00
303f68cf10 Update Qt version requirement to 6.7.0
GIT_SILENT
2024-08-02 10:15:46 +01:00
368cf2dd37 Port to QWaylandWindow::updateExposure() 2024-07-05 09:49:38 +03:00
3 changed files with 18 additions and 10 deletions

View File

@ -4,13 +4,13 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(layershellqt) project(layershellqt)
set(PROJECT_VERSION "6.1.80") set(PROJECT_VERSION "6.3.5")
set(PROJECT_VERSION_MAJOR 6) set(PROJECT_VERSION_MAJOR 6)
set(CMAKE_C_STANDARD 99) set(CMAKE_C_STANDARD 99)
set(QT_MIN_VERSION "6.6.0") set(QT_MIN_VERSION "6.7.0")
set(KF6_MIN_VERSION "6.2.0") set(KF6_MIN_VERSION "6.10.0")
set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(KDE_COMPILERSETTINGS_LEVEL "5.82")
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
@ -55,8 +55,8 @@ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
ecm_set_disabled_deprecation_versions(QT 6.5 ecm_set_disabled_deprecation_versions(QT 6.8.1
KF 5.240 KF 6.9.0
) )
add_subdirectory(src) add_subdirectory(src)

View File

@ -4,10 +4,16 @@
remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS) remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS)
add_library(LayerShellQtInterface) add_library(LayerShellQtInterface)
qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface FILES
${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml if (Qt6_VERSION VERSION_GREATER_EQUAL "6.8.0")
${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml set(private_code_option "PRIVATE_CODE")
${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml endif()
qt6_generate_wayland_protocol_client_sources(LayerShellQtInterface
${private_code_option}
FILES
${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml
${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
${CMAKE_CURRENT_SOURCE_DIR}/wlr-layer-shell-unstable-v1.xml
) )
ecm_qt_declare_logging_category(LayerShellQtInterface ecm_qt_declare_logging_category(LayerShellQtInterface

View File

@ -231,8 +231,10 @@ void QWaylandLayerSurface::sendExpose()
{ {
#if QT_VERSION < QT_VERSION_CHECK(6, 7, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 7, 0)
window()->handleExpose(QRect(QPoint(), m_pendingSize)); window()->handleExpose(QRect(QPoint(), m_pendingSize));
#else #elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
window()->sendRecursiveExposeEvent(); window()->sendRecursiveExposeEvent();
#else
window()->updateExposure();
#endif #endif
} }