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 | |
parent | fc9aae544beb7b0db70af85ee9855d28f4bb3671 (diff) |
Bump version to 6.7.0
Change-Id: I69954ccc5cfb44e7bf02b8fcab18e9320e7e8748
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | .cmake.conf | 2 | ||||
-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 | ||||
-rw-r--r-- | tests/auto/cmake/mockplugins/.cmake.conf | 2 | ||||
-rw-r--r-- | tests/auto/cmake/test_generating_cpp_exports/.cmake.conf | 2 | ||||
-rw-r--r-- | tests/auto/cmake/test_static_resources/.cmake.conf | 2 | ||||
-rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf index 88b287c77e..1a97dd237a 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -7,7 +7,7 @@ if (NOT DEFINED QT_SUPERBUILD OR DEFINED QT_REPO_MODULE_VERSION) set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") endif() -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.7.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_COPYRIGHT_YEAR "2023") diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 9372cb421f..15b607b0e0 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 9e35328de4..69a7765064 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 146dd2bd5a..56186d7a11 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") diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf index 146dd2bd5a..56186d7a11 100644 --- a/tests/auto/cmake/mockplugins/.cmake.conf +++ b/tests/auto/cmake/mockplugins/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.7.0") diff --git a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf index 146dd2bd5a..56186d7a11 100644 --- a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf +++ b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.7.0") diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf index 146dd2bd5a..56186d7a11 100644 --- a/tests/auto/cmake/test_static_resources/.cmake.conf +++ b/tests/auto/cmake/test_static_resources/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.7.0") diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index e28d7c04eb..b196e907a9 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -4666,7 +4666,7 @@ def create_top_level_cmake_conf(): conf_file_name = ".cmake.conf" try: with open(conf_file_name, "x") as file: - file.write('set(QT_REPO_MODULE_VERSION "6.6.0")\n') + file.write('set(QT_REPO_MODULE_VERSION "6.7.0")\n') except FileExistsError: pass |