1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDataStream:: bump version

Browse Source 
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 <thiago.macieira@intel.com>
Reviewed-by: Mate Barany <mate.barany@qt.io>
This commit is contained in:
Ivan Solovev 2025-04-14 18:00:57 +02:00
parent f12115e97c
commit ab48b4f266
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/serialization/qdatastream.h
View File

@ -90,7 +90,7 @@ public:
Qt_6_7 = 22, Qt_6_7 = 22,
Qt_6_8 = Qt_6_7, Qt_6_8 = Qt_6_7,
Qt_6_9 = Qt_6_7, Qt_6_9 = Qt_6_7,
Qt_6_10 = Qt_6_7, Qt_6_10 = 23,
Qt_DefaultCompiledVersion = Qt_6_10 Qt_DefaultCompiledVersion = Qt_6_10
#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion

1
tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp
View File

@ -300,6 +300,7 @@ static constexpr int NColorRoles[] = {
QPalette::PlaceholderText + 1, // Qt_6_0 QPalette::PlaceholderText + 1, // Qt_6_0
QPalette::Accent + 1, // Qt_6_6 QPalette::Accent + 1, // Qt_6_6
QPalette::Accent + 1, // Qt_6_7 QPalette::Accent + 1, // Qt_6_7
QPalette::Accent + 1, // Qt_6_10
}; };
// +1, because we start from "No Version" // +1, because we start from "No Version"