diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-27 18:07:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-29 12:16:26 +0100 |
| commit | cd5acab7aaad27d1d645215c800c1a002e6f83cb (patch) | |
| tree | 14a5c55eb0ee332e7230ff8d9365a3ec6ea4f6d7 /src/corelib/io | |
| parent | 0eccc02ff14ba32c7758ce076b045b6d3101d8d7 (diff) | |
Bump Qt version to 5.2.0
Change-Id: Id2a4b8fb00837154a7fc1bf96060c0cdc808f13d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qdatastream.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 5f5e9a8b72..42b263be77 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE return retVal; enum { - DefaultStreamVersion = QDataStream::Qt_5_1 + DefaultStreamVersion = QDataStream::Qt_5_2 }; /*! @@ -538,8 +538,9 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_4_7 Same as Qt_4_6. \value Qt_4_8 Same as Qt_4_6. \value Qt_4_9 Same as Qt_4_6. - \value Qt_5_0 Version 13 (Qt 5.0) + \value Qt_5_0 Version 13 (Qt 5.0, Qt 5.1, Qt 5.2) \value Qt_5_1 Same as Qt_5_0. + \value Qt_5_2 Same as Qt_5_0. \sa setVersion(), version() */ diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 6017ba5e7d..f893e6a503 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -86,8 +86,9 @@ public: Qt_4_8 = Qt_4_7, Qt_4_9 = Qt_4_8, Qt_5_0 = 13, - Qt_5_1 = Qt_5_0 -#if QT_VERSION >= 0x050200 + Qt_5_1 = Qt_5_0, + Qt_5_2 = Qt_5_1 +#if QT_VERSION >= 0x050300 #error Add the datastream version for this Qt version #endif }; |