diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-09-13 11:01:07 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-09-14 11:08:30 +0000 |
| commit | 9ecce4dff47d00a3fe2cf33abc1a08ba437ec03d (patch) | |
| tree | 527fe6990a37de19f22e5c163627a7d92457de60 /src/corelib | |
| parent | 8e8a55e6602f595c084a5849c2deeb8fdc3eafb7 (diff) | |
Adjust src/corelib/serialization/qdatastream.[h/cpp] for 6.3.0
Change-Id: I9809d6122c6d3c5ad5753d52679f4ac67a17e3d4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib')
| -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 5582e7269e..cb44bf620a 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -557,6 +557,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \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 + \value Qt_6_3 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 1ec9704a6a..4e2d785c5e 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -99,8 +99,9 @@ public: Qt_6_0 = 20, Qt_6_1 = Qt_6_0, Qt_6_2 = Qt_6_0, - Qt_DefaultCompiledVersion = Qt_6_2 -#if QT_VERSION >= 0x060300 + Qt_6_3 = Qt_6_0, + Qt_DefaultCompiledVersion = Qt_6_3 +#if QT_VERSION >= 0x060400 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif }; |