Skip to content

Commit ab48b4f

Browse files
committed
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 <[email protected]> Reviewed-by: Mate Barany <[email protected]>
1 parent f12115e commit ab48b4f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/corelib/serialization/qdatastream.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class Q_CORE_EXPORT QDataStream : public QIODeviceBase
9090
Qt_6_7 = 22,
9191
Qt_6_8 = Qt_6_7,
9292
Qt_6_9 = Qt_6_7,
93-
Qt_6_10 = Qt_6_7,
93+
Qt_6_10 = 23,
9494
Qt_DefaultCompiledVersion = Qt_6_10
9595
#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
9696
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion

tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ static constexpr int NColorRoles[] = {
300300
QPalette::PlaceholderText + 1, // Qt_6_0
301301
QPalette::Accent + 1, // Qt_6_6
302302
QPalette::Accent + 1, // Qt_6_7
303+
QPalette::Accent + 1, // Qt_6_10
303304
};
304305

305306
// +1, because we start from "No Version"

0 commit comments

Comments
 (0)