Bump Qt version to 5.3.0
Change-Id: Id15c3bcc4bced847a11eec08fcffda5100d778ec Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This commit is contained in:
parent
2d00d3951d
commit
7c35824e6b
@ -45,11 +45,11 @@
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#define QT_VERSION_STR "5.2.0"
|
||||
#define QT_VERSION_STR "5.3.0"
|
||||
/*
|
||||
QT_VERSION is (major << 16) + (minor << 8) + patch.
|
||||
*/
|
||||
#define QT_VERSION 0x050200
|
||||
#define QT_VERSION 0x050300
|
||||
/*
|
||||
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
|
||||
*/
|
||||
|
@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE
|
||||
return retVal;
|
||||
|
||||
enum {
|
||||
DefaultStreamVersion = QDataStream::Qt_5_2
|
||||
DefaultStreamVersion = QDataStream::Qt_5_3
|
||||
};
|
||||
|
||||
/*!
|
||||
@ -541,6 +541,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
|
||||
\value Qt_5_0 Version 13 (Qt 5.0)
|
||||
\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
|
||||
|
||||
\sa setVersion(), version()
|
||||
*/
|
||||
|
@ -87,8 +87,9 @@ public:
|
||||
Qt_4_9 = Qt_4_8,
|
||||
Qt_5_0 = 13,
|
||||
Qt_5_1 = 14,
|
||||
Qt_5_2 = 15
|
||||
#if QT_VERSION >= 0x050300
|
||||
Qt_5_2 = 15,
|
||||
Qt_5_3 = Qt_5_2
|
||||
#if QT_VERSION >= 0x050400
|
||||
#error Add the datastream version for this Qt version
|
||||
#endif
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user