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

Prepare QDataStream for Qt 6.0

Browse Source 
Add the required datastream versions for 6.0. Of course the number for
5.15 and 6.0 is still something we can bump.

Change-Id: I676385817befc06ea8d0ff1e9eba9c94cb4698b0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Lars Knoll 2019-04-30 13:25:33 +02:00
parent 415c435d60
commit a08c0ca949
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,9 +102,17 @@ public:
Qt_5_13 = 19, Qt_5_13 = 19,
Qt_5_14 = Qt_5_13, Qt_5_14 = Qt_5_13,
#if QT_VERSION >= 0x050f00 #if QT_VERSION >= 0x050f00
Qt_5_15 = Qt_5_14,
Qt_DefaultCompiledVersion = Qt_5_15
#elif QT_VERSION >= 0x060000
Qt_6_0 = Qt_5_15,
Qt_DefaultCompiledVersion = Qt_6_0
#else
Qt_DefaultCompiledVersion = Qt_5_14
#endif
#if QT_VERSION >= 0x060100
#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
#endif #endif
Qt_DefaultCompiledVersion = Qt_5_14
}; };
enum ByteOrder { enum ByteOrder {