diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2022-12-14 07:29:56 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2022-12-14 20:19:01 +0200 |
commit | d238833a053c07cbc33d47c778b1485cffd4b1ec (patch) | |
tree | 46af81be4269480ea8e2ad5ecbfeec28eb9996d4 | |
parent | ca64365e3a7245f6ef0f8f6962db3c1b85421cef (diff) | |
download | qtbase-d238833a053c07cbc33d47c778b1485cffd4b1ec.tar.gz |
Bump version to 6.6.0
Change-Id: I957e8a980542f16d3a3b493b41406bbeb884c2dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-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 979edb2e37..151bdb539f 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -8,7 +8,7 @@ if (NOT DEFINED QT_SUPERBUILD OR DEFINED QT_REPO_MODULE_VERSION) list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") endif() -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.6.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 ef404250b7..9372cb421f 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -525,6 +525,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \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 + \value Qt_6_6 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 8d89e4bb45..0942c3ed1d 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -68,8 +68,9 @@ public: Qt_6_3 = Qt_6_0, Qt_6_4 = Qt_6_0, Qt_6_5 = Qt_6_0, - Qt_DefaultCompiledVersion = Qt_6_5 -#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) + Qt_6_6 = Qt_6_0, + Qt_DefaultCompiledVersion = Qt_6_6 +#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 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 377be0059e..146dd2bd5a 100644 --- a/src/plugins/sqldrivers/.cmake.conf +++ b/src/plugins/sqldrivers/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.6.0") diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf index edb49ceeb2..473e7ea8e4 100644 --- a/tests/auto/cmake/mockplugins/.cmake.conf +++ b/tests/auto/cmake/mockplugins/.cmake.conf @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.6.0") set(QT_USE_SYNCQT_CPP TRUE) diff --git a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf index 377be0059e..146dd2bd5a 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.5.0") +set(QT_REPO_MODULE_VERSION "6.6.0") diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf index 377be0059e..146dd2bd5a 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.5.0") +set(QT_REPO_MODULE_VERSION "6.6.0") diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 086a70146e..487a57abd6 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.5.0")\n') + file.write('set(QT_REPO_MODULE_VERSION "6.6.0")\n') except FileExistsError: pass |