diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-20 09:10:56 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-20 09:10:56 (GMT) |
| commit | 2b13ca0aa0f3d7112d9f15e8622625e1f9050616 (patch) | |
| tree | a30bef5054414f129367d2e66edaf13a24a91c5f /src | |
| parent | f412a9cb0bd1438d1518cf6a8eda3fda5fbf64f5 (diff) | |
| parent | d7d837b0b864935a069013ca09f5fb9de40a4d02 (diff) | |
| download | Qt-2b13ca0aa0f3d7112d9f15e8622625e1f9050616.zip Qt-2b13ca0aa0f3d7112d9f15e8622625e1f9050616.tar.gz Qt-2b13ca0aa0f3d7112d9f15e8622625e1f9050616.tar.bz2 | |
Merge branch 'doc-4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7
Diffstat (limited to 'src')
| -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() */ |