Mercurial > octave
comparison libgui/src/octave-qobject.cc @ 32051:17a09d2bbe0f
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 |
comparison
equal
deleted
inserted
replaced
32050:c00d842608f7 | 32051:17a09d2bbe0f |
---|---|
30 #include <utility> | 30 #include <utility> |
31 | 31 |
32 #include <QApplication> | 32 #include <QApplication> |
33 #include <QClipboard> | 33 #include <QClipboard> |
34 #include <QFile> | 34 #include <QFile> |
35 #include <QTextCodec> | 35 #if ! defined (Q_OS_WIN32) |
36 # include <QTextCodec> | |
37 #endif | |
36 #include <QThread> | 38 #include <QThread> |
37 #include <QTimer> | 39 #include <QTimer> |
38 #include <QTranslator> | 40 #include <QTranslator> |
39 | 41 |
40 // QTerminal includes | 42 // QTerminal includes |
196 // Installing our handler suppresses the messages. | 198 // Installing our handler suppresses the messages. |
197 | 199 |
198 if (show_gui_msgs.empty ()) | 200 if (show_gui_msgs.empty ()) |
199 qInstallMessageHandler (message_handler); | 201 qInstallMessageHandler (message_handler); |
200 | 202 |
203 #if ! defined (Q_OS_WIN32) | |
201 // Set the codec for all strings (before wizard or any GUI object) | 204 // Set the codec for all strings (before wizard or any GUI object) |
202 #if ! defined (Q_OS_WIN32) | |
203 QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); | 205 QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); |
204 #endif | 206 #endif |
205 | 207 |
206 // Register octave_value_list for connecting thread crossing signals. | 208 // Register octave_value_list for connecting thread crossing signals. |
207 | 209 |