From: Matthew Fernandez Date: Sat, 31 Dec 2022 00:20:20 +0000 (-0800) Subject: gvedit MdiChild::saveFile: disable explicit UTF-8 saving with Qt ≥ 6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d8ac449acd5b417dd7b60c73a0777c84757ea55;p=graphviz gvedit MdiChild::saveFile: disable explicit UTF-8 saving with Qt ≥ 6 From Qt6 onwards, `QTextStream` is in UTF-8 by default:¹ By default, QStringConverter::Utf8 is used, and automatic unicode detection is enabled. Gitlab: #2233 ¹ https://doc.qt.io/qt-6.2/qtextstream.html#setEncoding --- diff --git a/cmd/gvedit/mdichild.cpp b/cmd/gvedit/mdichild.cpp index 3b41ce55c..c4390fbd9 100644 --- a/cmd/gvedit/mdichild.cpp +++ b/cmd/gvedit/mdichild.cpp @@ -10,7 +10,7 @@ #include #include - +#include #include "mdichild.h" #include "mainwindow.h" @@ -93,7 +93,9 @@ bool MdiChild::saveFile(const QString & fileName) QTextStream out(&file); QApplication::setOverrideCursor(Qt::WaitCursor); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) out.setCodec("UTF-8"); +#endif out << toPlainText(); out.flush(); QApplication::restoreOverrideCursor();