From 3217582405d937809ea69d93a8db411661c99747 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 1 Apr 2014 12:59:50 +0200 Subject: Simplify and update QDataStream's versioning documentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now we'll no longer need to maintain two separate tables containing the same information. Also, update the version after 4f50be8d1885e685ec8df3796e4156eb015affa7. Change-Id: I82fe243889cee67e47296cc4498c9a93d5472e81 Reviewed-by: Topi Reiniö --- src/corelib/io/qdatastream.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'src/corelib/io') diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 9944cc2e89..127244e994 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -538,7 +538,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_5_1 Version 14 (Qt 5.1) \value Qt_5_2 Version 15 (Qt 5.2) \value Qt_5_3 Same as Qt_5_2 - \value Qt_5_4 Same as Qt_5_2 + \value Qt_5_4 Version 16 (Qt 5.4) \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() @@ -555,7 +555,8 @@ void QDataStream::setByteOrder(ByteOrder bo) /*! \fn void QDataStream::setVersion(int v) - Sets the version number of the data serialization format to \a v. + Sets the version number of the data serialization format to \a v, + a value of the \l Version enum. You don't \e have to set a version if you are using the current version of Qt, but for your own custom binary formats we @@ -569,25 +570,6 @@ void QDataStream::setByteOrder(ByteOrder bo) with an earlier version of Qt, use this function to modify the serialization format used by QDataStream. - \table - \header \li Qt Version \li QDataStream Version - \row \li Qt 5.2 \li 15 - \row \li Qt 5.1 \li 14 - \row \li Qt 5.0 \li 13 - \row \li Qt 4.6 \li 12 - \row \li Qt 4.5 \li 11 - \row \li Qt 4.4 \li 10 - \row \li Qt 4.3 \li 9 - \row \li Qt 4.2 \li 8 - \row \li Qt 4.0, 4.1 \li 7 - \row \li Qt 3.3 \li 6 - \row \li Qt 3.1, 3.2 \li 5 - \row \li Qt 3.0 \li 4 - \row \li Qt 2.1, 2.2, 2.3 \li 3 - \row \li Qt 2.0 \li 2 - \row \li Qt 1.x \li 1 - \endtable - The \l Version enum provides symbolic constants for the different versions of Qt. For example: -- cgit v1.2.3