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

Bump version

Browse Source 
Change-Id: I35df4cbd3ef8bd9aeb0bcb853c3a10e88c062713
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-08-28 13:03:53 +02:00
parent 7293200ace
commit ae58676102
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,11 +41,11 @@
#include <stddef.h> #include <stddef.h>
#define QT_VERSION_STR "5.6.0" #define QT_VERSION_STR "5.7.0"
/* /*
QT_VERSION is (major << 16) + (minor << 8) + patch. QT_VERSION is (major << 16) + (minor << 8) + patch.
*/ */
#define QT_VERSION 0x050600 #define QT_VERSION 0x050700
/* /*
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))
*/ */

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

@ -527,6 +527,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_5_4 Version 16 (Qt 5.4) \value Qt_5_4 Version 16 (Qt 5.4)
\value Qt_5_5 Same as Qt_5_4 \value Qt_5_5 Same as Qt_5_4
\value Qt_5_6 Same as Qt_5_4 \value Qt_5_6 Same as Qt_5_4
\value Qt_5_7 Same as Qt_5_4
\omitvalue Qt_DefaultCompiledVersion \omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version() \sa setVersion(), version()

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

@ -84,10 +84,11 @@ public:
Qt_5_4 = 16, Qt_5_4 = 16,
Qt_5_5 = Qt_5_4, Qt_5_5 = Qt_5_4,
Qt_5_6 = Qt_5_5, Qt_5_6 = Qt_5_5,
#if QT_VERSION >= 0x050700 Qt_5_7 = Qt_5_5,
#if QT_VERSION >= 0x050800
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
#endif #endif
Qt_DefaultCompiledVersion = Qt_5_6 Qt_DefaultCompiledVersion = Qt_5_7
}; };
enum ByteOrder { enum ByteOrder {