Mercurial > octave

diff libgui/src/octave-qobject.cc @ 32051:17a09d2bbe0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: Remove usage of QTextCodec from some more places. * libgui/src/gui-preference.h: Remove unused header. * libgui/src/octave-qobject.cc: Include header only if function from it are used. * m4/acinclude.m4: Do not require Qt6Core5Compat on platforms that don't need it.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 23 Apr 2023 11:08:16 +0200
parents c8dd3da44e83
children 29f761f24ab0
line wrap: on
line diff
--- a/libgui/src/octave-qobject.cc	Sat Apr 22 20:59:48 2023 +0200
+++ b/libgui/src/octave-qobject.cc	Sun Apr 23 11:08:16 2023 +0200
@@ -32,7 +32,9 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QFile>
-#include <QTextCodec>
+#if ! defined (Q_OS_WIN32)
+#  include <QTextCodec>
+#endif
 #include <QThread>
 #include <QTimer>
 #include <QTranslator>
@@ -198,8 +200,8 @@
   if (show_gui_msgs.empty ())
     qInstallMessageHandler (message_handler);
 
+#if ! defined (Q_OS_WIN32)
   // Set the codec for all strings (before wizard or any GUI object)
-#if ! defined (Q_OS_WIN32)
   QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8"));
 #endif