diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-04 18:07:28 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-04 18:07:28 +0200 |
| commit | df9de3e4543b8f8bf4ec4c53921700133e37f051 (patch) | |
| tree | ef48adfd943eb5b9bed007739e5a07f5993bc119 | |
| parent | 6a0f59f9c1c7a0a1a28988b89025145d81f3a6aa (diff) | |
Bump version
Change-Id: I355b940f568273cf00d55c7c3abc569537be7950
| -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 5153f8139f..f3a052109f 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.10.0 +MODULE_VERSION = 5.11.0 diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 1486d3630c..5fa5b558ea 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -563,6 +563,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \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 + \value Qt_5_11 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 0a429d091a..1f1b13686c 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -97,10 +97,11 @@ public: Qt_5_8 = Qt_5_7, Qt_5_9 = Qt_5_8, Qt_5_10 = Qt_5_9, -#if QT_VERSION >= 0x050b00 + Qt_5_11 = Qt_5_10, +#if QT_VERSION >= 0x050c00 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif - Qt_DefaultCompiledVersion = Qt_5_10 + Qt_DefaultCompiledVersion = Qt_5_11 }; enum ByteOrder { |