Bump version to 5.5
Change-Id: I8fd9ec2ea1138a94478b73a284ea1b550b62bd5a Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>bb10
parent
805b88a997
commit
6e5e1f16eb
|
|
@ -45,11 +45,11 @@
|
|||
|
||||
#include <stddef.h>
|
||||
|
||||
#define QT_VERSION_STR "5.4.0"
|
||||
#define QT_VERSION_STR "5.5.0"
|
||||
/*
|
||||
QT_VERSION is (major << 16) + (minor << 8) + patch.
|
||||
*/
|
||||
#define QT_VERSION 0x050400
|
||||
#define QT_VERSION 0x050500
|
||||
/*
|
||||
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -539,6 +539,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
|
|||
\value Qt_5_2 Version 15 (Qt 5.2)
|
||||
\value Qt_5_3 Same as Qt_5_2
|
||||
\value Qt_5_4 Version 16 (Qt 5.4)
|
||||
\value Qt_5_5 Same as Qt_5_4
|
||||
\omitvalue Qt_DefaultCompiledVersion
|
||||
|
||||
\sa setVersion(), version()
|
||||
|
|
|
|||
|
|
@ -90,10 +90,11 @@ public:
|
|||
Qt_5_2 = 15,
|
||||
Qt_5_3 = Qt_5_2,
|
||||
Qt_5_4 = 16,
|
||||
#if QT_VERSION >= 0x050500
|
||||
Qt_5_5 = Qt_5_4,
|
||||
#if QT_VERSION >= 0x050600
|
||||
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
|
||||
#endif
|
||||
Qt_DefaultCompiledVersion = Qt_5_4
|
||||
Qt_DefaultCompiledVersion = Qt_5_5
|
||||
};
|
||||
|
||||
enum ByteOrder {
|
||||
|
|
|
|||
Loading…
Reference in New Issue