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

Bump version to 6.4.0

Browse Source 
Change-Id: Ie0e2133d6c9125b901364c979c60b6efd585f026
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
This commit is contained in:
Jani Heikkinen 2022-01-28 07:58:37 +02:00
parent 8dce9ee119
commit 994fd04b2b
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cmake.conf
View File

@ -1,4 +1,4 @@
set(QT_REPO_MODULE_VERSION "6.3.0")
set(QT_REPO_MODULE_VERSION "6.4.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
# Minimum requirement for building Qt

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

@ -558,6 +558,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_6_1 Same as Qt_6_0
\value Qt_6_2 Same as Qt_6_0
\value Qt_6_3 Same as Qt_6_0
\value Qt_6_4 Same as Qt_6_0
\omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version()

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

@ -100,8 +100,9 @@ public:
Qt_6_1 = Qt_6_0,
Qt_6_2 = Qt_6_0,
Qt_6_3 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_3
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
Qt_6_4 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_4
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 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.3.0")
set(QT_REPO_MODULE_VERSION "6.4.0")

2
util/cmake/pro2cmake.py
View File

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