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

Bump version

Browse Source 
Change-Id: I2d747693a5251b8b7b5329795aef7a31032c2c05
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Friedemann Kleint 2017-02-02 13:51:25 +01:00
parent 59ad4465b1
commit 4cde33b70b
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_SOURCE_TREE = $$PWD
QT_BUILD_TREE = $$shadowed($$PWD) QT_BUILD_TREE = $$shadowed($$PWD)
MODULE_VERSION = 5.9.0 MODULE_VERSION = 5.10.0

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

@ -562,6 +562,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_5_7 Same as Qt_5_6 \value Qt_5_7 Same as Qt_5_6
\value Qt_5_8 Same as Qt_5_6 \value Qt_5_8 Same as Qt_5_6
\value Qt_5_9 Same as Qt_5_6 \value Qt_5_9 Same as Qt_5_6
\value Qt_5_10 Same as Qt_5_6
\omitvalue Qt_DefaultCompiledVersion \omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version() \sa setVersion(), version()

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

@ -96,10 +96,11 @@ public:
Qt_5_7 = Qt_5_6, Qt_5_7 = Qt_5_6,
Qt_5_8 = Qt_5_7, Qt_5_8 = Qt_5_7,
Qt_5_9 = Qt_5_8, Qt_5_9 = Qt_5_8,
#if QT_VERSION >= 0x050a00 Qt_5_10 = Qt_5_9,
#if QT_VERSION >= 0x050b00
#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_9 Qt_DefaultCompiledVersion = Qt_5_10
}; };
enum ByteOrder { enum ByteOrder {