summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-07 11:23:01 (GMT)
committerJesper Thomschutz <jesper.thomschutz@nokia.com>2010-01-13 09:24:33 (GMT)
commitfa54cd8d2a3edf2e994c5b287ae3c1f3506b72bc (patch)
treeb8d3753dc302bc6b62f8e1bdd759388dcf1bfaf7
parentb76d3f7e6d4fe2acc874b91515a4ae33388748cb (diff)
downloadQt-fa54cd8d2a3edf2e994c5b287ae3c1f3506b72bc.zip
Qt-fa54cd8d2a3edf2e994c5b287ae3c1f3506b72bc.tar.gz
Qt-fa54cd8d2a3edf2e994c5b287ae3c1f3506b72bc.tar.bz2
doc: Added enum values to table for Qt 4.5 and 4.6.
Task-number: QTBUG-7156 (cherry picked from commit 45af493eeeb408f756cc7d76088cbc3e35f5f54b)
-rw-r--r--src/corelib/io/qdatastream.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index 1383a3b..5eb25d6 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -592,15 +592,17 @@ void QDataStream::setByteOrder(ByteOrder bo)
recommend that you do; see \l{Versioning} in the Detailed
Description.
- In order to accommodate new functionality, the datastream
- serialization format of some Qt classes has changed in some
- versions of Qt. If you want to read data that was created by an
- earlier version of Qt, or write data that can be read by a
- program that was compiled with an earlier version of Qt, use this
- function to modify the serialization format used by QDataStream.
+ To accommodate new functionality, the datastream serialization
+ format of some Qt classes has changed in some versions of Qt. If
+ you want to read data that was created by an earlier version of
+ Qt, or write data that can be read by a program that was compiled
+ with an earlier version of Qt, use this function to modify the
+ serialization format used by QDataStream.
\table
\header \i Qt Version \i QDataStream Version
+ \row \i Qt 4.6 \i 12
+ \row \i Qt 4.5 \i 11
\row \i Qt 4.4 \i 10
\row \i Qt 4.3 \i 9
\row \i Qt 4.2 \i 8