summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-05-08 10:46:48 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-05-08 10:46:48 (GMT)
commita2d584df2b72ed5bcd4886dcccafd7a54308f36b (patch)
treef394b25101bc5bb6c3f0bc48e2f3e269e96359a7 /src/corelib
parent2412b0410dcf97cf348ce703722a1b4f7ce623df (diff)
parentd1889402eff75b8dabf67e80c16e3e3316d187e8 (diff)
downloadQt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.zip
Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.tar.gz
Qt-a2d584df2b72ed5bcd4886dcccafd7a54308f36b.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qtextstream.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index 2010008..ed9d0aa 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -67,8 +67,7 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384;
\snippet doc/src/snippets/code/src_corelib_io_qtextstream.cpp 1
Note that you cannot use QTextStream::atEnd(), which returns true when you
- have reached the end of the data stream, with stdin because as long as the
- application is running, stdin has no end.
+ have reached the end of the data stream, with stdin.
Besides using QTextStream's constructors, you can also set the
device or string QTextStream operates on by calling setDevice() or