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

Bump version to 6.7.0

Browse Source 
Change-Id: I69954ccc5cfb44e7bf02b8fcab18e9320e7e8748
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Jani Heikkinen 2023-06-12 06:35:21 +01:00
parent fc9aae544b
commit 808a63e761
8 changed files with 10 additions and 8 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.6.0") set(QT_REPO_MODULE_VERSION "6.7.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_COPYRIGHT_YEAR "2023") set(QT_COPYRIGHT_YEAR "2023")

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

@ -526,6 +526,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_6_4 Same as Qt_6_0 \value Qt_6_4 Same as Qt_6_0
\value Qt_6_5 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_6 Same as Qt_6_0
\value Qt_6_7 Same as Qt_6_6
\omitvalue Qt_DefaultCompiledVersion \omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version() \sa setVersion(), version()

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

@ -69,8 +69,9 @@ public:
Qt_6_4 = Qt_6_0, Qt_6_4 = Qt_6_0,
Qt_6_5 = Qt_6_0, Qt_6_5 = Qt_6_0,
Qt_6_6 = 21, Qt_6_6 = 21,
Qt_DefaultCompiledVersion = Qt_6_6 Qt_6_7 = Qt_6_6,
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) 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 #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.6.0") set(QT_REPO_MODULE_VERSION "6.7.0")

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

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.6.0") set(QT_REPO_MODULE_VERSION "6.7.0")

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

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.6.0") set(QT_REPO_MODULE_VERSION "6.7.0")

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

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.6.0") set(QT_REPO_MODULE_VERSION "6.7.0")

2
util/cmake/pro2cmake.py
View File

@ -4666,7 +4666,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.6.0")\n') file.write('set(QT_REPO_MODULE_VERSION "6.7.0")\n')
except FileExistsError: except FileExistsError:
pass pass