whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Qt version to 5.2.0 

Change-Id: Id2a4b8fb00837154a7fc1bf96060c0cdc808f13d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Sergio Ahumada 2013-03-27 18:07:42 +01:00 committed by The Qt Project
parent 0eccc02ff1
commit cd5acab7aa
3 changed files with 8 additions and 6 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>
#define QT_VERSION_STR "5.1.0"
#define QT_VERSION_STR "5.2.0"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/
#define QT_VERSION 0x050100
#define QT_VERSION 0x050200
/*
can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
*/

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

@ -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()
*/

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

@ -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
};