diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-10 16:57:11 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 16:57:11 +0000 |
| commit | 0866680bd904aff4fe2a643a2b81c460cbb99c77 (patch) | |
| tree | 242dae052199994a35f5e68578661175241a0a71 /src/corelib/io/qtextstream.cpp | |
| parent | 34ea269b3b173498312b0203d6875ef3b4ba0253 (diff) | |
| parent | fc35f714340d5361231506dfbead132122f59460 (diff) | |
| download | qtbase-0866680bd904aff4fe2a643a2b81c460cbb99c77.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qtextstream.cpp')
| -rw-r--r-- | src/corelib/io/qtextstream.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index f870fb11e3..fa455c0e8c 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -1574,11 +1574,10 @@ QString QTextStream::readAll() the stream contains lines longer than this, then the lines will be split after \a maxlen characters and returned in parts. - If \a maxlen is 0, the lines can be of any length. A common value - for \a maxlen is 75. + If \a maxlen is 0, the lines can be of any length. The returned line has no trailing end-of-line characters ("\\n" - or "\\r\\n"), so calling QString::trimmed() is unnecessary. + or "\\r\\n"), so calling QString::trimmed() can be unnecessary. If the stream has read to the end of the file, \l {QTextStream::readLine()}{readLine()} will return a null QString. For strings, or for devices that support it, |