summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2022-06-06 12:55:22 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2022-06-06 13:23:59 +0300
commit0cbb471b1bb3e9bc37de672618f38ae23220344e (patch)
tree011c98ae3d46df21329a9517e24eddf380559fc1
parentc450285c415f6b3ee528cbb3df35dedce157ffff (diff)
Bump version to 6.5.0
Change-Id: I83a4f915a914bdc18f6706bb902f3e3b13da074f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
-rw-r--r--.cmake.conf2
-rw-r--r--src/corelib/serialization/qdatastream.cpp1
-rw-r--r--src/corelib/serialization/qdatastream.h5
-rw-r--r--src/plugins/sqldrivers/.cmake.conf2
-rw-r--r--tests/auto/cmake/mockplugins/.cmake.conf2
-rw-r--r--tests/auto/cmake/test_generating_cpp_exports/.cmake.conf2
-rw-r--r--tests/auto/cmake/test_static_resources/.cmake.conf2
-rwxr-xr-xutil/cmake/pro2cmake.py2
8 files changed, 10 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 9d09fbd7c8..fce7707bcd 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -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
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 59a2a4c53f..34f8f7b5ff 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -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()
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index fa8b5e6f3e..20541725ec 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -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
};
diff --git a/src/plugins/sqldrivers/.cmake.conf b/src/plugins/sqldrivers/.cmake.conf
index f7a41402e0..377be0059e 100644
--- a/src/plugins/sqldrivers/.cmake.conf
+++ b/src/plugins/sqldrivers/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.4.0")
+set(QT_REPO_MODULE_VERSION "6.5.0")
diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf
index f7a41402e0..377be0059e 100644
--- a/tests/auto/cmake/mockplugins/.cmake.conf
+++ b/tests/auto/cmake/mockplugins/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.4.0")
+set(QT_REPO_MODULE_VERSION "6.5.0")
diff --git a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
index f7a41402e0..377be0059e 100644
--- a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
+++ b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.4.0")
+set(QT_REPO_MODULE_VERSION "6.5.0")
diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf
index f7a41402e0..377be0059e 100644
--- a/tests/auto/cmake/test_static_resources/.cmake.conf
+++ b/tests/auto/cmake/test_static_resources/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.4.0")
+set(QT_REPO_MODULE_VERSION "6.5.0")
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index cfbcc10c55..f8d83a9539 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -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