whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version 

Change-Id: Icf0c81067f65b922a8473f9dce4aecefadf5b32d
bb10
Oswald Buddenhagen 2018-10-11 12:59:42 +02:00
parent d7944c2921
commit 9f89e07d75
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.qmake.conf
View File

@ -4,4 +4,4 @@ CONFIG += warning_clean
QT_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD)
MODULE_VERSION = 5.12.0
MODULE_VERSION = 5.13.0

1
src/corelib/serialization/qdatastream.cpp
View File

@ -565,6 +565,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_5_10 Same as Qt_5_6
\value Qt_5_11 Same as Qt_5_6
\value Qt_5_12 Version 18 (Qt 5.12)
\value Qt_5_13 Same as Qt_5_12
\omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version()

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

@ -99,10 +99,11 @@ public:
Qt_5_10 = Qt_5_9,
Qt_5_11 = Qt_5_10,
Qt_5_12 = 18,
#if QT_VERSION >= 0x050d00
Qt_5_13 = Qt_5_12,
#if QT_VERSION >= 0x050e00
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
#endif
Qt_DefaultCompiledVersion = Qt_5_12
Qt_DefaultCompiledVersion = Qt_5_13
};
enum ByteOrder {