Bump version to 6.8.0

Change-Id: I407e6fd7a766450bb6fe00da7f6ebbd49496e5cd Reviewed-by: Jani Heikkinen <[email protected]>
RawnHelly · Dec 11, 2023 · 4663019 · 4663019
1 parent a81395f
commit 4663019
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git 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.7.0")
+set(QT_REPO_MODULE_VERSION "6.8.0")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
 
 set(QT_COPYRIGHT_YEAR "2023")

diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
@@ -527,6 +527,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
     \value Qt_6_5 Same as Qt_6_0
     \value Qt_6_6 Version 21 (Qt 6.6)
     \value Qt_6_7 Version 22 (Qt 6.7)
+    \value Qt_6_8 Same as Qt_6_7
     \omitvalue Qt_DefaultCompiledVersion
 
     \sa setVersion(), version()

diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
@@ -84,8 +84,9 @@ class Q_CORE_EXPORT QDataStream : public QIODeviceBase
         Qt_6_5 = Qt_6_0,
         Qt_6_6 = 21,
         Qt_6_7 = 22,
-        Qt_DefaultCompiledVersion = Qt_6_7
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+        Qt_6_8 = Qt_6_7,
+        Qt_DefaultCompiledVersion = Qt_6_8
+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 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.7.0")
+set(QT_REPO_MODULE_VERSION "6.8.0")
diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.7.0")
+set(QT_REPO_MODULE_VERSION "6.8.0")
diff --git 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.7.0")
+set(QT_REPO_MODULE_VERSION "6.8.0")
diff --git 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.7.0")
+set(QT_REPO_MODULE_VERSION "6.8.0")
diff --git 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.7.0")\n')
+            file.write('set(QT_REPO_MODULE_VERSION "6.8.0")\n')
     except FileExistsError:
         pass
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		set(QT_REPO_MODULE_VERSION "6.7.0")
		set(QT_REPO_MODULE_VERSION "6.8.0")