summaryrefslogtreecommitdiffstats
path: root/src/corelib/serialization/qtextstream.cpp
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2022-09-06 17:21:40 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2022-09-07 01:09:31 +0200
commitc76f7cbbcbe68bf785e8d8cbbe641cd6c0e42834 (patch)
treec868e03f9285661816ec7abef69feb17224c2837 /src/corelib/serialization/qtextstream.cpp
parentafb2fdc107390a6cd3a8e12ad0d19364e5925048 (diff)
QTextStream: Fix logical error in setEncoding
We only want to enable writing BOM if we have _not_ started writing. Fixes: QTBUG-106279 Pick-to: 6.2 6.3.2 6.4 6.4.0 Change-Id: Ibcbc101b931615fddb2507f01307bf9619772d7b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/serialization/qtextstream.cpp')
-rw-r--r--src/corelib/serialization/qtextstream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index 5b0ab7fb47..ca2f0684d4 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -2941,7 +2941,7 @@ void QTextStream::setEncoding(QStringConverter::Encoding encoding)
d->encoding = encoding;
d->toUtf16 = QStringDecoder(d->encoding);
- bool generateBOM = d->hasWrittenData && d->generateBOM;
+ bool generateBOM = !d->hasWrittenData && d->generateBOM;
d->fromUtf16 = QStringEncoder(d->encoding,
generateBOM ? QStringEncoder::Flag::WriteBom : QStringEncoder::Flag::Default);