Bump version to 6.4.0

Change-Id: Ie0e2133d6c9125b901364c979c60b6efd585f026 Reviewed-by: Qt Submodule Update Bot <[email protected]>
isolovev · Jan 31, 2022 · 994fd04 · 994fd04
1 parent 8dce9ee
commit 994fd04
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.cmake.conf b/.cmake.conf
@@ -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

diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
@@ -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()

diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
@@ -100,8 +100,9 @@ class Q_CORE_EXPORT QDataStream : public QIODeviceBase
         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
     };

diff --git a/src/plugins/sqldrivers/.cmake.conf b/src/plugins/sqldrivers/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.3.0")
+set(QT_REPO_MODULE_VERSION "6.4.0")
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		set(QT_REPO_MODULE_VERSION "6.3.0")
		set(QT_REPO_MODULE_VERSION "6.4.0")