AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version to 6.5.0

Browse Source 
Change-Id: I83a4f915a914bdc18f6706bb902f3e3b13da074f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
This commit is contained in:
Jani Heikkinen 2022-06-06 12:55:22 +03:00
parent c450285c41
commit 0cbb471b1b
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")
endif()
set(QT_REPO_MODULE_VERSION "6.4.0")
set(QT_REPO_MODULE_VERSION "6.5.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
# Minimum requirement for building Qt

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

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

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

@ -67,8 +67,9 @@ public:
Qt_6_2 = Qt_6_0,
Qt_6_3 = Qt_6_0,
Qt_6_4 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_4
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
Qt_6_5 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_5
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 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.4.0")
set(QT_REPO_MODULE_VERSION "6.5.0")

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

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.4.0")
set(QT_REPO_MODULE_VERSION "6.5.0")

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

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.4.0")
set(QT_REPO_MODULE_VERSION "6.5.0")

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

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.4.0")
set(QT_REPO_MODULE_VERSION "6.5.0")

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.4.0")\n')
file.write('set(QT_REPO_MODULE_VERSION "6.5.0")\n')
except FileExistsError:
pass