From c143ff8a4ff613d313718ad8835760816772dbd3 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Tue, 25 Aug 2026 18:50:12 +0200 Subject: [PATCH] Session 025: Fix QTextCodec migration issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Z/src/qsql_informix/qsql_informix.cpp: Fixed QTextCodec include path (QtCore → QtGui) as QTextCodec moved to QtGui module in Qt6 - Z/src/qsql_informix/CMakeLists.txt: Added Qt6::Gui dependency required for QTextCodec - Lts/Tools/TextEditorTest/textedit.cpp: Fixed Qt::codecForHtml → QTextCodec::codecForHtml (static method on QTextCodec class in Qt6) These are minimal fixes required for Qt6 compatibility. QTextCodec is now part of QtGui module and codecForHtml is a static method on QTextCodec class rather than Qt namespace function. Co-authored-by: Copilot <2235566219+Copilot@users.noreply.github.com> --- .../qt6-migrated-legatus/Lts/Tools/TextEditorTest/textedit.cpp | 2 +- .../qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt | 1 + .../qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/textedit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/textedit.cpp index ab0d12512..238aece3a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/textedit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/TextEditorTest/textedit.cpp @@ -367,7 +367,7 @@ bool TextEdit::load(const QString &f) return false; QByteArray data = file.readAll(); - QTextCodec *codec = Qt::codecForHtml(data); + QTextCodec *codec = QTextCodec::codecForHtml(data); QString str = codec->toUnicode(data); if (Qt::mightBeRichText(str)) { QUrl baseUrl = (f.front() == QLatin1Char(':') ? QUrl(f) : QUrl::fromLocalFile(f)).adjusted(QUrl::RemoveFilename); diff --git a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt index a758c5346..2dc35cc13 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt @@ -29,6 +29,7 @@ SET(ifx_SRCS ADD_LIBRARY(qsql_informix SHARED ${ifx_SRCS}) TARGET_LINK_LIBRARIES(qsql_informix Qt6::Core + Qt6::Gui Qt6::Sql Qt6::Core5Compat ${ICLIENT_SDK_LIBRARIES} diff --git a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp index e1f2fe9cb..f8e928ac7 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp +++ b/qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/qsql_informix.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include