summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-22 11:42:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-22 11:42:06 (GMT)
commitb8fa411051eda208dfd0e0c658710c77a04ce998 (patch)
tree3e14cca2d22113fd732107a505ac86f75b9eeda7 /src
parentddebaa91a500566bb73f6e01e68907b7a8f4e699 (diff)
parent0406b2665167d85b3cf348b615a049fb757afa62 (diff)
downloadQt-b8fa411051eda208dfd0e0c658710c77a04ce998.zip
Qt-b8fa411051eda208dfd0e0c658710c77a04ce998.tar.gz
Qt-b8fa411051eda208dfd0e0c658710c77a04ce998.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: amend the doc, as suggested by rittk
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qdatastream.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index f27ecc1..0b98e1e 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -158,10 +158,9 @@ QT_BEGIN_NAMESPACE
\section1 Reading and writing Qt collection classes
- The Qt collection classes can also be serialized to a QDataStream.
+ The Qt container classes can also be serialized to a QDataStream.
These include QList, QLinkedList, QVector, QSet, QHash, and QMap.
- These classes have have stream operators declared as non-member of
- the class.
+ The stream operators are declared as non-members of the classes.
\target Serializing Qt Classes
\section1 Reading and writing other Qt classes.