From 9a12f7e083552d00abd448ec7ec9914ac00f6d83 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Thu, 7 Jan 2021 09:08:06 +0100 Subject: [PATCH] Bump version CMake edition. Also update default compiled version. Task-number: QTQAINFRA-4126 Change-Id: Ia6f535f553e73bd6b00e2e20752f4961af21ede5 Reviewed-by: Kai Koehne --- .cmake.conf | 2 +- src/corelib/serialization/qdatastream.h | 5 +++-- src/plugins/sqldrivers/.cmake.conf | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cmake.conf b/.cmake.conf index 2680c4a33d7..b470bd0d027 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 32ccf7d6cc2..c1b521c8516 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 9305480451b..213991f5890 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")