qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump version 

Change-Id: I930e3fdd98f6a32a130ddcf671cf68f61d0c225d
This commit is contained in:
Oswald Buddenhagen 2018-02-20 19:53:08 +01:00
parent 16e4d017e4
commit 24ccb402e5
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.11.0 MODULE_VERSION = 5.12.0

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

@ -564,6 +564,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\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 \value Qt_5_10 Same as Qt_5_6
\value Qt_5_11 Same as Qt_5_6 \value Qt_5_11 Same as Qt_5_6
\value Qt_5_12 Same as Qt_5_6
\omitvalue Qt_DefaultCompiledVersion \omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version() \sa setVersion(), version()

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

@ -98,10 +98,11 @@ public:
Qt_5_9 = Qt_5_8, Qt_5_9 = Qt_5_8,
Qt_5_10 = Qt_5_9, Qt_5_10 = Qt_5_9,
Qt_5_11 = Qt_5_10, Qt_5_11 = Qt_5_10,
#if QT_VERSION >= 0x050c00 Qt_5_12 = Qt_5_11,
#if QT_VERSION >= 0x050d00
#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_11 Qt_DefaultCompiledVersion = Qt_5_12
}; };
enum ByteOrder { enum ByteOrder {