diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-20 09:21:00 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-20 09:21:00 (GMT) |
| commit | e7000e016e82ca9ca64db9246ccbef8fc1efa279 (patch) | |
| tree | fbb5beb7f368921ff5d4ad01265c5e5b601f2587 | |
| parent | f5fcf515f73390ce124027335bb74d4a4c5f7b43 (diff) | |
| parent | 2b13ca0aa0f3d7112d9f15e8622625e1f9050616 (diff) | |
| download | Qt-e7000e016e82ca9ca64db9246ccbef8fc1efa279.zip Qt-e7000e016e82ca9ca64db9246ccbef8fc1efa279.tar.gz Qt-e7000e016e82ca9ca64db9246ccbef8fc1efa279.tar.bz2 | |
Merge branch 'doc-4.7' into 4.7
| -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() */ |