Qt6: eliminate dependency on Qt5Compat module

tcobbs · Sep 4, 2024 · 7a2d3b0 · 7a2d3b0
1 parent 4ee7e7a
commit 7a2d3b0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/QT/LDView.pro b/QT/LDView.pro
@@ -38,7 +38,7 @@ TEMPLATE	= app
 CONFIG		+= qt opengl thread warn_on release
 QT  		+= opengl network
 contains(QT_VERSION, ^6\\..*) {
-   QT += core5compat widgets gui core openglwidgets printsupport
+   QT += widgets gui core openglwidgets printsupport
    DEFINES += QOPENGLWIDGET
 }
 message(Qt: $$QT_VERSION)

diff --git a/QT/QTMain.cpp b/QT/QTMain.cpp
@@ -2,7 +2,7 @@
 #include "QtWebClientPlugin.h"
 #if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 #include <QWidget>
-#include <QTextCodec>
+//#include <QTextCodec>
 #include <QtOpenGL>
 #else
 #include <QApplication>

diff --git a/TCFoundation/TCLocalStrings.cpp b/TCFoundation/TCLocalStrings.cpp
@@ -1267,8 +1267,10 @@ void TCLocalStrings::instSetCodePage(int codePage)
 	QString name;
 
 	name = QString("CP%1").arg(codePage);
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0) || defined(QT_BUILD_CORE5COMPAT_LIB)
 	m_textCodec =
 		QTextCodec::codecForName((const char *)name.toLatin1().constData());
+#endif
 #endif // WIN32
 }
 
@@ -1500,6 +1502,7 @@ void TCLocalStrings::mbstowstring(std::wstring &dst, const char *src,
 #if !defined(WIN32) && !defined(__APPLE__) && !defined(_OSMESA)
 	else if (m_textCodec)
 	{
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0) || defined(QT_BUILD_CORE5COMPAT_LIB)
 		QString unicodeString = m_textCodec->toUnicode(src);
 		dst.clear();
 		dst.resize(unicodeString.length());
@@ -1509,6 +1512,7 @@ void TCLocalStrings::mbstowstring(std::wstring &dst, const char *src,
 
 			dst[i] = (wchar_t)qchar.unicode();
 		}
+#endif
 	}
 #endif // WIN32
 	else

diff --git a/appveyor.yml b/appveyor.yml
@@ -23,8 +23,8 @@ environment:
       QT: 5.15
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
       QT: 6.5
-#    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
-#      QT: 6.7
+    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204
+      QT: 6.7
     - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma
 
 install: