diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-02-19 12:14:50 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-20 09:23:55 +0100 |
| commit | de1d5d2e39039a24e7740e68af65c8b9ff5d79ba (patch) | |
| tree | 0a5c2b0c86c4d31904e90c4ffe7f52111b5ae30c /src | |
| parent | 0ed63f0a2bfe875a09f8c3ba18eafd2b4e15e8da (diff) | |
| download | qtbase-de1d5d2e39039a24e7740e68af65c8b9ff5d79ba.tar.gz | |
Bump Qt version to 5.4.0
Change-Id: I9eea1d2e383aff7eec4817b17c098a6fcc03e041
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 4 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/io/qdatastream.h | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 59d72396cf..7789461a1c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -45,11 +45,11 @@ #include <stddef.h> -#define QT_VERSION_STR "5.3.0" +#define QT_VERSION_STR "5.4.0" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x050300 +#define QT_VERSION 0x050400 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index a6fbffee7e..a4c4dbf5ff 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_3 + DefaultStreamVersion = QDataStream::Qt_5_4 }; /*! @@ -542,6 +542,7 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_5_1 Version 14 (Qt 5.1) \value Qt_5_2 Version 15 (Qt 5.2) \value Qt_5_3 Same as Qt_5_2 + \value Qt_5_4 Same as Qt_5_2 \sa setVersion(), version() */ diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 28f1d51a12..fb8dce0641 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -88,8 +88,9 @@ public: Qt_5_0 = 13, Qt_5_1 = 14, Qt_5_2 = 15, - Qt_5_3 = Qt_5_2 -#if QT_VERSION >= 0x050400 + Qt_5_3 = Qt_5_2, + Qt_5_4 = Qt_5_3 +#if QT_VERSION >= 0x050500 #error Add the datastream version for this Qt version #endif }; |