diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2023-06-12 06:35:21 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2023-06-12 14:46:07 +0100 |
| commit | 808a63e761b51c93c8427163a525b8f7e7bfaf16 (patch) | |
| tree | a32ff19bebaee2c22b659e75a342edebc69e55db /src | |
| parent | fc9aae544beb7b0db70af85ee9855d28f4bb3671 (diff) | |
Bump version to 6.7.0
Change-Id: I69954ccc5cfb44e7bf02b8fcab18e9320e7e8748
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 5 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/.cmake.conf | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 9372cb421fb..15b607b0e03 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -526,6 +526,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_6_4 Same as Qt_6_0 \value Qt_6_5 Same as Qt_6_0 \value Qt_6_6 Same as Qt_6_0 + \value Qt_6_7 Same as Qt_6_6 \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 9e35328de41..69a77650645 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -69,8 +69,9 @@ public: Qt_6_4 = Qt_6_0, Qt_6_5 = Qt_6_0, Qt_6_6 = 21, - Qt_DefaultCompiledVersion = Qt_6_6 -#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) + Qt_6_7 = Qt_6_6, + Qt_DefaultCompiledVersion = Qt_6_7 +#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0) #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif }; diff --git a/src/plugins/sqldrivers/.cmake.conf b/src/plugins/sqldrivers/.cmake.conf index 146dd2bd5ad..56186d7a114 100644 --- a/src/plugins/sqldrivers/.cmake.conf +++ b/src/plugins/sqldrivers/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.7.0") |