lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Qt6 API compatibility in LtsWidgets

Browse Source 
- 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>
This commit is contained in:
torstenandCopilot committed 2026-08-21 11:19:16 +02:00
1 parent 418443c841
commit 22a3a8d5b1
3 files changed
+2 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_date_time_edit_p.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ void DigitsLineEdit::wheelEvent(QWheelEvent *event)
return; return;
event->accept(); event->accept();
int cursorPos = cursorPosition(); int cursorPos = cursorPosition();
emit wheelEventReceived(event->delta() > 0, cursorPos); emit wheelEventReceived(event->angleDelta().y() > 0, cursorPos);
} }
void DigitsLineEdit::keyPressEvent(QKeyEvent *event) void DigitsLineEdit::keyPressEvent(QKeyEvent *event)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_notification_box.cpp
-1
View File
@@ -172,7 +172,6 @@ void LtsNotificationBox::message(const QString &title, const QString &text, Mess
void LtsNotificationBox::paintEvent(QPaintEvent *) void LtsNotificationBox::paintEvent(QPaintEvent *)
{ {
QStyleOption opt; QStyleOption opt;
opt.init(this);
QPainter p(this); QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
} }
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/lts_text_editor2.cpp
+1 -3
View File
@@ -21,7 +21,6 @@
#include <QFontDatabase> #include <QFontDatabase>
#include <QMenu> #include <QMenu>
#include <QMenuBar> #include <QMenuBar>
#include <QTextCodec>
#include <QTextEdit> #include <QTextEdit>
#include <QStatusBar> #include <QStatusBar>
#include <QToolBar> #include <QToolBar>
@@ -439,8 +438,7 @@ bool LtsTextEditor2::load(const QString &f)
return false; return false;
QByteArray data = file.readAll(); QByteArray data = file.readAll();
QTextCodec *codec = Qt::codecForHtml(data); QString str = QString::fromUtf8(data);
QString str = codec->toUnicode(data);
if (Qt::mightBeRichText(str)) { if (Qt::mightBeRichText(str)) {
QUrl baseUrl = (f.front() == QLatin1Char(':') ? QUrl(f) : QUrl::fromLocalFile(f)).adjusted(QUrl::RemoveFilename); QUrl baseUrl = (f.front() == QLatin1Char(':') ? QUrl(f) : QUrl::fromLocalFile(f)).adjusted(QUrl::RemoveFilename);
m_textEdit->document()->setBaseUrl(baseUrl); m_textEdit->document()->setBaseUrl(baseUrl);