diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-21 07:14:43 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-21 07:14:43 (GMT) |
| commit | 1b840a40e943ca89fa878e9a4fcc73fc7807d9c9 (patch) | |
| tree | a02744ec77f9229373e115b88d80f126c7d56ae7 /src/corelib | |
| parent | 584a58474b7c42a0480573b5fd8fb053b464e7db (diff) | |
| parent | e7000e016e82ca9ca64db9246ccbef8fc1efa279 (diff) | |
| download | Qt-1b840a40e943ca89fa878e9a4fcc73fc7807d9c9.zip Qt-1b840a40e943ca89fa878e9a4fcc73fc7807d9c9.tar.gz Qt-1b840a40e943ca89fa878e9a4fcc73fc7807d9c9.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index eab0662..6091ec0 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -3019,8 +3019,8 @@ void QTextStream::setAutoDetectUnicode(bool enabled) } /*! - Returns true if automatic Unicode detection is enabled; otherwise - returns false. + Returns true if automatic Unicode detection is enabled, otherwise + returns false. Automatic Unicode detection is enabled by default. \sa setAutoDetectUnicode(), setCodec() */ @@ -3051,7 +3051,8 @@ void QTextStream::setGenerateByteOrderMark(bool generate) /*! Returns true if QTextStream is set to generate the UTF BOM (Byte Order - Mark) when using a UTF codec; otherwise returns false. + Mark) when using a UTF codec; otherwise returns false. UTF BOM generation is + set to false by default. \sa setGenerateByteOrderMark() */ |