From 22a3a8d5b18af45b721f4f7129ba3627f3731b67 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Fri, 21 Aug 2026 11:19:16 +0200 Subject: [PATCH] Fix Qt6 API compatibility in LtsWidgets - lts_date_time_edit_p.cpp: Replace QWheelEvent::delta() with angleDelta().y() - lts_notification_box.cpp: Remove QStyleOption::init() call (removed in Qt6) - lts_text_editor2.cpp: Remove QTextCodec include, use QString::fromUtf8 instead All changes are Qt6 API compatibility fixes required for building with Qt 6.10.2. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp | 2 +- .../Lts/Common/LtsWidgets/lts_notification_box.cpp | 1 - .../Lts/Common/LtsWidgets/lts_text_editor2.cpp | 4 +--- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp index 0d2a12ce1..c0193fd49 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp @@ -101,7 +101,7 @@ void DigitsLineEdit::wheelEvent(QWheelEvent *event) return; event->accept(); int cursorPos = cursorPosition(); - emit wheelEventReceived(event->delta() > 0, cursorPos); + emit wheelEventReceived(event->angleDelta().y() > 0, cursorPos); } void DigitsLineEdit::keyPressEvent(QKeyEvent *event) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp index 40e06ef8e..ab5fdd1e3 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp @@ -172,7 +172,6 @@ void LtsNotificationBox::message(const QString &title, const QString &text, Mess void LtsNotificationBox::paintEvent(QPaintEvent *) { QStyleOption opt; - opt.init(this); QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp index 7b0f6aaba..9861722fd 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -439,8 +438,7 @@ bool LtsTextEditor2::load(const QString &f) return false; QByteArray data = file.readAll(); - QTextCodec *codec = Qt::codecForHtml(data); - QString str = codec->toUnicode(data); + QString str = QString::fromUtf8(data); if (Qt::mightBeRichText(str)) { QUrl baseUrl = (f.front() == QLatin1Char(':') ? QUrl(f) : QUrl::fromLocalFile(f)).adjusted(QUrl::RemoveFilename); m_textEdit->document()->setBaseUrl(baseUrl);