diff options
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 5 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/.cmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/mockplugins/.cmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/test_generating_cpp_exports/.cmake.conf | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/test_static_resources/.cmake.conf | 2 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
8 files changed, 10 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf index 96c28affff..cfc3f8c5ff 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.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 index 11236c14f1..fda399512d 100644 --- 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 index 861c2e7a65..7d061b7316 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -84,8 +84,9 @@ public: 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 index 56186d7a11..10bc1fd407 100644 --- 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 index 56186d7a11..10bc1fd407 100644 --- 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 index 56186d7a11..10bc1fd407 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.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 index 56186d7a11..10bc1fd407 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.7.0") +set(QT_REPO_MODULE_VERSION "6.8.0") diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index b196e907a9..0ef35410ce 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.7.0")\n') + file.write('set(QT_REPO_MODULE_VERSION "6.8.0")\n') except FileExistsError: pass |