From a7a5782fc8b5497031b65930f12201bcc4fd44ed Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Fri, 9 Oct 2026 18:16:39 +0000 Subject: [PATCH] fix: Add TrainingAreaBase to release scope and fix QScroller for Qt6 - Add Lts/Proxies/TrainingAreaBase to release scope for training_area_telegrams.h - Update make_rpm_ubuntu26.py to include Lts/Proxies/TrainingAreaBase in release scope - Add directory filtering for Lts/Proxies in copy_src_dir_to_dest_dir - Fix lts_base.h: conditionally compile QScroller code (Qt5 only) - QScroller removed in Qt6, touch scrolling enabled by default Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Lts/Common/LtsWidgets/lts_base.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h index 764fdff9d..0296f6e3f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_base.h @@ -16,8 +16,10 @@ #include #include #include -#include #include +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +#include +#endif #include @@ -80,6 +82,7 @@ inline void addTouchScroll(QWidget *widget) { if (!widget) return; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) widget->setAttribute(Qt::WA_AcceptTouchEvents); { @@ -101,6 +104,10 @@ inline void addTouchScroll(QWidget *widget) return; } } +#else + // Qt6: Touch scrolling is enabled by default for scrollable widgets + Q_UNUSED(widget) +#endif } enum class ButtonSize