diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2021-01-07 09:08:06 +0100 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2021-01-11 13:58:55 +0100 |
| commit | 9a12f7e083552d00abd448ec7ec9914ac00f6d83 (patch) | |
| tree | 4e5a6c55be95b1570cd33d3ee4460154b57746e8 | |
| parent | 149ad1e615bf0974e52a681af73e9fb04bc1c762 (diff) | |
| download | qtbase-9a12f7e083552d00abd448ec7ec9914ac00f6d83.tar.gz | |
Bump version
CMake edition.
Also update default compiled version.
Task-number: QTQAINFRA-4126
Change-Id: Ia6f535f553e73bd6b00e2e20752f4961af21ede5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | .cmake.conf | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qdatastream.h | 5 | ||||
| -rw-r--r-- | src/plugins/sqldrivers/.cmake.conf | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf index 2680c4a33d..b470bd0d02 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.0.0") +set(QT_REPO_MODULE_VERSION "6.1.0") # Minimum requirement for building Qt set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.18") diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 32ccf7d6cc..c1b521c851 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -97,8 +97,9 @@ public: Qt_5_14 = Qt_5_13, Qt_5_15 = Qt_5_14, Qt_6_0 = 20, - Qt_DefaultCompiledVersion = Qt_6_0 -#if QT_VERSION >= 0x060100 + Qt_6_1 = Qt_6_0, + Qt_DefaultCompiledVersion = Qt_6_1 +#if QT_VERSION >= 0x060200 #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 9305480451..213991f589 100644 --- a/src/plugins/sqldrivers/.cmake.conf +++ b/src/plugins/sqldrivers/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.0.0") +set(QT_REPO_MODULE_VERSION "6.1.0") |