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 | ||||
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/.cmake.conf b/.cmake.conf index 7e3a04a0df1..57401cb9b9b 100644 --- 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 index ec3bd06a34c..67423ee62c4 100644 --- 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 index a673bfab82a..584de3166a7 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -100,8 +100,9 @@ public: 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 index aae2a6822b2..f7a41402e01 100644 --- 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 index 87520d1e60e..7494cfcefa6 100755 --- 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 |