From 2d72757875c913939909a1a36fcb123a1e26ac26 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 3 Jun 2024 06:14:01 +0100 Subject: [PATCH] Bump version to 6.9.0 Change-Id: I6a6f4d4e4c2e4fa8b83078ee5864cc923265ac2e Reviewed-by: Edward Welbourne --- .cmake.conf | 2 +- src/corelib/serialization/qdatastream.cpp | 1 + src/corelib/serialization/qdatastream.h | 5 +++-- src/plugins/sqldrivers/.cmake.conf | 2 +- tests/auto/cmake/mockplugins/.cmake.conf | 2 +- tests/auto/cmake/test_generating_cpp_exports/.cmake.conf | 2 +- tests/auto/cmake/test_static_resources/.cmake.conf | 2 +- tests/auto/tools/rcc/data/legal/rcc_legal.cpp | 2 +- util/cmake/pro2cmake.py | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.cmake.conf b/.cmake.conf index d3738283b9f..2f94aafe22b 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.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_COPYRIGHT "Copyright (C) The Qt Company Ltd. and other contributors.") diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 329be4a294e..3d6d1d8e926 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -547,6 +547,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_6_6 Version 21 (Qt 6.6) \value Qt_6_7 Version 22 (Qt 6.7) \value Qt_6_8 Same as Qt_6_7 + \value Qt_6_9 Same as Qt_6_7 \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index e094d76c13e..32b0f96ab89 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -88,8 +88,9 @@ class Q_CORE_EXPORT QDataStream : public QIODeviceBase Qt_6_6 = 21, Qt_6_7 = 22, Qt_6_8 = Qt_6_7, - Qt_DefaultCompiledVersion = Qt_6_8 -#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0) + Qt_6_9 = Qt_6_7, + Qt_DefaultCompiledVersion = Qt_6_9 +#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 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 10bc1fd4077..6d83b084f78 100644 --- a/src/plugins/sqldrivers/.cmake.conf +++ b/src/plugins/sqldrivers/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf index 10bc1fd4077..6d83b084f78 100644 --- a/tests/auto/cmake/mockplugins/.cmake.conf +++ b/tests/auto/cmake/mockplugins/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") diff --git a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf index 10bc1fd4077..6d83b084f78 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.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf index 10bc1fd4077..6d83b084f78 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.8.0") +set(QT_REPO_MODULE_VERSION "6.9.0") diff --git a/tests/auto/tools/rcc/data/legal/rcc_legal.cpp b/tests/auto/tools/rcc/data/legal/rcc_legal.cpp index 7522e1b34ff..deec3380aa9 100644 --- a/tests/auto/tools/rcc/data/legal/rcc_legal.cpp +++ b/tests/auto/tools/rcc/data/legal/rcc_legal.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2024 Intel Corporation. ** SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only ** -** Created by: The Resource Compiler for Qt version 6.8.0 +** Created by: The Resource Compiler for Qt version 6.9.0 ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 0ef35410ce1..bc43f3ec28f 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.8.0")\n') + file.write('set(QT_REPO_MODULE_VERSION "6.9.0")\n') except FileExistsError: pass