diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-18 06:52:50 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-18 08:03:19 +0100 |
| commit | 51e50bd1e66b2ba30619e9d6b388261c2622b37e (patch) | |
| tree | d12e40d5027bedb990ec7a9dfe935614fe9527b6 /src/corelib/serialization | |
| parent | 27f2ef24cde895da7000773366020ab228abcd5e (diff) | |
Bump the version of QDataStream
Amends f731802ba82ad260e155783e0427fb3f6ebd99fe.
Change-Id: I1ba758ef4c9d80fbc11ecc78e0480f57c95007e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src/corelib/serialization')
| -rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 88207fe072..5582e7269e 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -556,6 +556,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_5_15 Same as Qt_5_13 \value Qt_6_0 Version 20 (Qt 6.0) \value Qt_6_1 Same as Qt_6_0 + \value Qt_6_2 Same as Qt_6_0 \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index c1b521c851..523dabfdc6 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -98,8 +98,9 @@ public: Qt_5_15 = Qt_5_14, Qt_6_0 = 20, Qt_6_1 = Qt_6_0, - Qt_DefaultCompiledVersion = Qt_6_1 -#if QT_VERSION >= 0x060200 + Qt_6_2 = Qt_6_0, + Qt_DefaultCompiledVersion = Qt_6_2 +#if QT_VERSION >= 0x060300 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif }; |