Bump version to 6.10.0

Change-Id: Iad7b22da970e4e95816aaa0643206ecf502e23af Reviewed-by: Qt Submodule Update Bot <[email protected]>
qt · Dec 13, 2024 · 5b805f5 · 5b805f5
1 parent 083ebfa
commit 5b805f5
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git 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.9.0")
+set(QT_REPO_MODULE_VERSION "6.10.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
@@ -548,6 +548,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \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
+    \value Qt_6_10 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
@@ -89,8 +89,9 @@ class Q_CORE_EXPORT QDataStream : public QIODeviceBase
         Qt_6_7 = 22,
         Qt_6_8 = Qt_6_7,
         Qt_6_9 = Qt_6_7,
-        Qt_DefaultCompiledVersion = Qt_6_9
-#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+        Qt_6_10 = Qt_6_7,
+        Qt_DefaultCompiledVersion = Qt_6_10
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 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
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.9.0")
+set(QT_REPO_MODULE_VERSION "6.10.0")
diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.9.0")
+set(QT_REPO_MODULE_VERSION "6.10.0")
diff --git 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.9.0")
+set(QT_REPO_MODULE_VERSION "6.10.0")
diff --git 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.9.0")
+set(QT_REPO_MODULE_VERSION "6.10.0")
diff --git 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.9.0
+** Created by: The Resource Compiler for Qt version 6.10.0
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/

diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
@@ -4658,7 +4658,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.9.0")\n')
+            file.write('set(QT_REPO_MODULE_VERSION "6.10.0")\n')
     except FileExistsError:
         pass
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		set(QT_REPO_MODULE_VERSION "6.9.0")
		set(QT_REPO_MODULE_VERSION "6.10.0")