summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-10-20 21:55:20 -0700
committerThiago Macieira <thiago.macieira@intel.com>2018-11-08 15:19:58 +0000
commitf80ed83cd92deb015b78c39f4c634c046ef75b1c (patch)
tree0f81d6360889c2a29fede406d3c7195ecf09aa96 /src
parent99baa0d4401516cff978cab8a7102fc0a25731a9 (diff)
Correct which codecs QTextStream::autoDetectUnicode detects
Fixes: QTBUG-67187 Change-Id: If7e743cf8476463880ccfffd155f86b78a279f81 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src')
-rw-r--r--src/corelib/serialization/qtextstream.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index 05a5a55926..2d22cb291d 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -3111,15 +3111,15 @@ QTextCodec *QTextStream::codec() const
}
/*!
- If \a enabled is true, QTextStream will attempt to detect Unicode
- encoding by peeking into the stream data to see if it can find the
- UTF-16 or UTF-32 BOM (Byte Order Mark). If this mark is found, QTextStream
- will replace the current codec with the UTF codec.
+ If \a enabled is true, QTextStream will attempt to detect Unicode encoding
+ by peeking into the stream data to see if it can find the UTF-8, UTF-16, or
+ UTF-32 Byte Order Mark (BOM). If this mark is found, QTextStream will
+ replace the current codec with the UTF codec.
This function can be used together with setCodec(). It is common
to set the codec to UTF-8, and then enable UTF-16 detection.
- \sa autoDetectUnicode(), setCodec()
+ \sa autoDetectUnicode(), setCodec(), QTextCodec::codecForUtfText()
*/
void QTextStream::setAutoDetectUnicode(bool enabled)
{
@@ -3131,7 +3131,7 @@ void QTextStream::setAutoDetectUnicode(bool enabled)
Returns \c true if automatic Unicode detection is enabled, otherwise
returns \c false. Automatic Unicode detection is enabled by default.
- \sa setAutoDetectUnicode(), setCodec()
+ \sa setAutoDetectUnicode(), setCodec(), QTextCodec::codecForUtfText()
*/
bool QTextStream::autoDetectUnicode() const
{