1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump version to 6.10.0

Browse Source 
Change-Id: Iad7b22da970e4e95816aaa0643206ecf502e23af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
This commit is contained in:
Jani Heikkinen 2024-12-10 07:08:39 +00:00
parent 083ebfa1a5
commit 5b805f54c2
9 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cmake.conf
View File

@ -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") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")
endif() 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_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_COPYRIGHT "Copyright (C) The Qt Company Ltd. and other contributors.") set(QT_COPYRIGHT "Copyright (C) The Qt Company Ltd. and other contributors.")

1
src/corelib/serialization/qdatastream.cpp
View File

@ -548,6 +548,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_6_7 Version 22 (Qt 6.7) \value Qt_6_7 Version 22 (Qt 6.7)
\value Qt_6_8 Same as Qt_6_7 \value Qt_6_8 Same as Qt_6_7
\value Qt_6_9 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 \omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version() \sa setVersion(), version()

5
src/corelib/serialization/qdatastream.h
View File

@ -89,8 +89,9 @@ public:
Qt_6_7 = 22, Qt_6_7 = 22,
Qt_6_8 = Qt_6_7, Qt_6_8 = Qt_6_7,
Qt_6_9 = Qt_6_7, Qt_6_9 = Qt_6_7,
Qt_DefaultCompiledVersion = Qt_6_9 Qt_6_10 = Qt_6_7,
#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0) 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 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
#endif #endif
}; };

2
src/plugins/sqldrivers/.cmake.conf
View File

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_REPO_MODULE_VERSION "6.10.0")

2
tests/auto/cmake/mockplugins/.cmake.conf
View File

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_REPO_MODULE_VERSION "6.10.0")

2
tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
View File

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_REPO_MODULE_VERSION "6.10.0")

2
tests/auto/cmake/test_static_resources/.cmake.conf
View File

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.9.0") set(QT_REPO_MODULE_VERSION "6.10.0")

2
tests/auto/tools/rcc/data/legal/rcc_legal.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2024 Intel Corporation. ** Copyright (C) 2024 Intel Corporation.
** SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only ** 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! ** WARNING! All changes made in this file will be lost!
*****************************************************************************/ *****************************************************************************/

2
util/cmake/pro2cmake.py
View File

@ -4658,7 +4658,7 @@ def create_top_level_cmake_conf():
conf_file_name = ".cmake.conf" conf_file_name = ".cmake.conf"
try: try:
with open(conf_file_name, "x") as file: 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: except FileExistsError:
pass pass