Mercurial > octave
changeset 22678:0705873185bc
maint: Periodic merge of stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 27 Oct 2016 13:17:07 -0400 |
| parents | d318bc8e83ee (current diff) f88de8f27259 (diff) |
| children | e70551dacef6 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/octave-gui.cc Thu Oct 27 12:33:52 2016 -0400 +++ b/libgui/src/octave-gui.cc Thu Oct 27 13:17:07 2016 -0400 @@ -159,6 +159,10 @@ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); #endif +#if defined (HAVE_QT4) + QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8")); +#endif + // set windows style for windows #if defined (Q_OS_WIN32) qt_app.setStyle(QStyleFactory::create("Windows"));