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>
This commit is contained in:
1 file changed
+8
-1
@@ -16,8 +16,10 @@
|
|||||||
#include <QtCore/QString>
|
#include <QtCore/QString>
|
||||||
#include <QtGui/QIcon>
|
#include <QtGui/QIcon>
|
||||||
#include <QtWidgets/QScrollArea>
|
#include <QtWidgets/QScrollArea>
|
||||||
#include <QScroller>
|
|
||||||
#include <QtWidgets/QAbstractItemView>
|
#include <QtWidgets/QAbstractItemView>
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
#include <QScroller>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
@@ -80,6 +82,7 @@ inline void addTouchScroll(QWidget *widget)
|
|||||||
{
|
{
|
||||||
if (!widget)
|
if (!widget)
|
||||||
return;
|
return;
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
||||||
widget->setAttribute(Qt::WA_AcceptTouchEvents);
|
widget->setAttribute(Qt::WA_AcceptTouchEvents);
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -101,6 +104,10 @@ inline void addTouchScroll(QWidget *widget)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// Qt6: Touch scrolling is enabled by default for scrollable widgets
|
||||||
|
Q_UNUSED(widget)
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class ButtonSize
|
enum class ButtonSize
|
||||||
|
|||||||
Reference in new issue
Block a user