AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Qt version to 5.3.0

Browse Source 
Change-Id: Id15c3bcc4bced847a11eec08fcffda5100d778ec
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This commit is contained in:
Thiago Macieira 2013-09-22 19:39:39 -07:00 committed by The Qt Project
parent 2d00d3951d
commit 7c35824e6b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/global/qglobal.h
View File

@ -45,11 +45,11 @@
#include <stddef.h> #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. 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)) can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
*/ */

3
src/corelib/io/qdatastream.cpp
View File

@ -251,7 +251,7 @@ QT_BEGIN_NAMESPACE
return retVal; return retVal;
enum { 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_0 Version 13 (Qt 5.0)
\value Qt_5_1 Version 14 (Qt 5.1) \value Qt_5_1 Version 14 (Qt 5.1)
\value Qt_5_2 Version 15 (Qt 5.2) \value Qt_5_2 Version 15 (Qt 5.2)
\value Qt_5_3 Same as Qt_5_2
\sa setVersion(), version() \sa setVersion(), version()
*/ */

5
src/corelib/io/qdatastream.h
View File

@ -87,8 +87,9 @@ public:
Qt_4_9 = Qt_4_8, Qt_4_9 = Qt_4_8,
Qt_5_0 = 13, Qt_5_0 = 13,
Qt_5_1 = 14, Qt_5_1 = 14,
Qt_5_2 = 15 Qt_5_2 = 15,
#if QT_VERSION >= 0x050300 Qt_5_3 = Qt_5_2
#if QT_VERSION >= 0x050400
#error Add the datastream version for this Qt version #error Add the datastream version for this Qt version
#endif #endif
}; };