qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump version to 6.9.0 

Change-Id: I6a6f4d4e4c2e4fa8b83078ee5864cc923265ac2e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Jani Heikkinen 2024-06-03 06:14:01 +01:00
parent 71053abba3
commit 2d72757875
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")
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.")

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

@ -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()

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

@ -88,8 +88,9 @@ public:
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
};

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

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

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

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

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

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

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

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

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

@ -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!
*****************************************************************************/

2
util/cmake/pro2cmake.py
View File

@ -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