mirror of
https://invent.kde.org/plasma/layer-shell-qt.git
synced 2025-07-14 11:04:20 -04:00
Compare commits
8 Commits
work/david
...
v6.2.1
Author | SHA1 | Date | |
---|---|---|---|
c45feb4094 | |||
3fca657826 | |||
2dbd1d6eb7 | |||
0d11058c8f | |||
a5fbaa5975 | |||
6f8a3f5d42 | |||
303f68cf10 | |||
368cf2dd37 |
@ -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.2.1")
|
||||||
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.5.0")
|
||||||
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user