diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 15:56:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 15:56:01 (GMT) |
| commit | 668f1bcdb6e75ad420fd510ec7e264ca87f5c174 (patch) | |
| tree | 731b9cc16bbbe0b17e0a4640822bf17908684130 /src/corelib | |
| parent | 53f5b448f5dd33459837536a855463c917b4c14e (diff) | |
| parent | fbf91dc787c15f561686cd708735ff8f45984aba (diff) | |
| download | Qt-668f1bcdb6e75ad420fd510ec7e264ca87f5c174.zip Qt-668f1bcdb6e75ad420fd510ec7e264ca87f5c174.tar.gz Qt-668f1bcdb6e75ad420fd510ec7e264ca87f5c174.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Added my changes to the changelog.
Clarified documentation of loadFinished() signal.
Added a condition to skip obsolete functions during the threadness check.
Doc: call qApp->precessEvents after QSplashScreen::showMessage
Doc: Said that QApplication exits when not able to open X11 display
Doc: maintainance - fixing grammar and spelling
Doc: Added a note to qmake INSTALLS docs
Doc: Fixing overlapping text problem in columns
Doc: Added info on QWidget::render to printing docs
Added default value documentation for two variables.
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() */ |