AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump the version of QDataStream

Browse Source 
Amends f731802ba8.

Change-Id: I1ba758ef4c9d80fbc11ecc78e0480f57c95007e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Friedemann Kleint 2021-02-18 06:52:50 +01:00
parent 27f2ef24cd
commit 51e50bd1e6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/serialization/qdatastream.cpp
View File

@ -556,6 +556,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_5_15 Same as Qt_5_13 \value Qt_5_15 Same as Qt_5_13
\value Qt_6_0 Version 20 (Qt 6.0) \value Qt_6_0 Version 20 (Qt 6.0)
\value Qt_6_1 Same as Qt_6_0 \value Qt_6_1 Same as Qt_6_0
\value Qt_6_2 Same as Qt_6_0
\omitvalue Qt_DefaultCompiledVersion \omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version() \sa setVersion(), version()

5
src/corelib/serialization/qdatastream.h
View File

@ -98,8 +98,9 @@ public:
Qt_5_15 = Qt_5_14, Qt_5_15 = Qt_5_14,
Qt_6_0 = 20, Qt_6_0 = 20,
Qt_6_1 = Qt_6_0, Qt_6_1 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_1 Qt_6_2 = Qt_6_0,
#if QT_VERSION >= 0x060200 Qt_DefaultCompiledVersion = Qt_6_2
#if QT_VERSION >= 0x060300
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
#endif #endif
}; };