From ab48b4f266f82897162114300ee78bc5f4cb9a76 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 14 Apr 2025 18:00:57 +0200 Subject: [PATCH] QDataStream:: bump version It is required to update the serialization of QGeoPolygon in QtPositioning. Need to adjust tst_qdatastream as well. Task-number: QTBUG-135967 Change-Id: I81bf1c011717d5ecd92fd6c81136053b4f06bf49 Reviewed-by: Thiago Macieira Reviewed-by: Mate Barany --- src/corelib/serialization/qdatastream.h | 2 +- .../auto/corelib/serialization/qdatastream/tst_qdatastream.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index da99948dde7..1dad3badb77 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -90,7 +90,7 @@ public: Qt_6_7 = 22, Qt_6_8 = Qt_6_7, Qt_6_9 = Qt_6_7, - Qt_6_10 = Qt_6_7, + Qt_6_10 = 23, Qt_DefaultCompiledVersion = Qt_6_10 #if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp index 461fded8aa5..c8fb5f25f70 100644 --- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp @@ -300,6 +300,7 @@ static constexpr int NColorRoles[] = { QPalette::PlaceholderText + 1, // Qt_6_0 QPalette::Accent + 1, // Qt_6_6 QPalette::Accent + 1, // Qt_6_7 + QPalette::Accent + 1, // Qt_6_10 }; // +1, because we start from "No Version"