summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <[email protected]>2025-06-04 10:38:40 +0100
committerJani Heikkinen <[email protected]>2025-06-05 00:07:53 +0100
commit7f1e6f8079f10ec9f78afec81ec861e06da8e5f5 (patch)
tree1d594086fda420c5b4f08383132623d90304c36a
parent5c563a98a5ffe2a72a641bfa9ed30e17ecffd893 (diff)
Bump version to 6.11.0HEADdev
Change-Id: I14ec3a08bf704535b9b10e33ec8ee0f9415f2d7c Reviewed-by: Qt Submodule Update Bot <[email protected]>
-rw-r--r--.cmake.conf2
-rw-r--r--src/corelib/serialization/qdatastream.cpp1
-rw-r--r--src/corelib/serialization/qdatastream.h5
-rw-r--r--src/plugins/sqldrivers/.cmake.conf2
-rw-r--r--tests/auto/cmake/mockplugins/.cmake.conf2
-rw-r--r--tests/auto/cmake/test_generating_cpp_exports/.cmake.conf2
-rw-r--r--tests/auto/cmake/test_static_resources/.cmake.conf2
-rw-r--r--tests/auto/tools/rcc/data/legal/rcc_legal.cpp2
8 files changed, 10 insertions, 8 deletions
diff --git a/.cmake.conf b/.cmake.conf
index 2ed248728f9..737d60b685f 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.10.0")
+set(QT_REPO_MODULE_VERSION "6.11.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_COPYRIGHT "Copyright (C) The Qt Company Ltd. and other contributors.")
diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 8abcd239945..8377cba4ec8 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -550,6 +550,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_6_8 Same as Qt_6_7
\value Qt_6_9 Same as Qt_6_7
\value Qt_6_10 Same as Qt_6_7
+ \value Qt_6_11 Same as Qt_6_10
\omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version()
diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h
index 1dad3badb77..ea8ab1f16f0 100644
--- a/src/corelib/serialization/qdatastream.h
+++ b/src/corelib/serialization/qdatastream.h
@@ -91,8 +91,9 @@ public:
Qt_6_8 = Qt_6_7,
Qt_6_9 = Qt_6_7,
Qt_6_10 = 23,
- Qt_DefaultCompiledVersion = Qt_6_10
-#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ Qt_6_11 = Qt_6_10,
+ Qt_DefaultCompiledVersion = Qt_6_11
+#if QT_VERSION >= QT_VERSION_CHECK(6, 12, 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 4f4aa68f29b..be788d10f8e 100644
--- a/src/plugins/sqldrivers/.cmake.conf
+++ b/src/plugins/sqldrivers/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.10.0")
+set(QT_REPO_MODULE_VERSION "6.11.0")
diff --git a/tests/auto/cmake/mockplugins/.cmake.conf b/tests/auto/cmake/mockplugins/.cmake.conf
index 4f4aa68f29b..be788d10f8e 100644
--- a/tests/auto/cmake/mockplugins/.cmake.conf
+++ b/tests/auto/cmake/mockplugins/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.10.0")
+set(QT_REPO_MODULE_VERSION "6.11.0")
diff --git a/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf b/tests/auto/cmake/test_generating_cpp_exports/.cmake.conf
index 4f4aa68f29b..be788d10f8e 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.10.0")
+set(QT_REPO_MODULE_VERSION "6.11.0")
diff --git a/tests/auto/cmake/test_static_resources/.cmake.conf b/tests/auto/cmake/test_static_resources/.cmake.conf
index 4f4aa68f29b..be788d10f8e 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.10.0")
+set(QT_REPO_MODULE_VERSION "6.11.0")
diff --git a/tests/auto/tools/rcc/data/legal/rcc_legal.cpp b/tests/auto/tools/rcc/data/legal/rcc_legal.cpp
index c7840fca914..248ab2e3b48 100644
--- a/tests/auto/tools/rcc/data/legal/rcc_legal.cpp
+++ b/tests/auto/tools/rcc/data/legal/rcc_legal.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2024 Intel Corporation.
** SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
**
-** Created by: The Resource Compiler for Qt version 6.10.0
+** Created by: The Resource Compiler for Qt version 6.11.0
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/