diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-02 13:51:25 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-03 12:01:58 +0000 |
| commit | 4cde33b70b017d758117acbd9f1841c31bfaad98 (patch) | |
| tree | a6342fc355e17e9b7b5f823d5331ac3132d93f9a | |
| parent | 59ad4465b1d36e3b69dbb6ed5ad8f2f406730591 (diff) | |
Bump version
Change-Id: I2d747693a5251b8b7b5329795aef7a31032c2c05
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream.h | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 6d42bbdd34..5153f8139f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ CONFIG += warning_clean QT_SOURCE_TREE = $$PWD QT_BUILD_TREE = $$shadowed($$PWD) -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.10.0 diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 2369fe4726..58e2500057 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -562,6 +562,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_5_7 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_10 Same as Qt_5_6 \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index ecd55f71ae..31507fdf73 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -96,10 +96,11 @@ public: Qt_5_7 = Qt_5_6, Qt_5_8 = Qt_5_7, 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 #endif - Qt_DefaultCompiledVersion = Qt_5_9 + Qt_DefaultCompiledVersion = Qt_5_10 }; enum ByteOrder { |