diff options
Diffstat (limited to 'src/corelib/global/qsysinfo.h')
-rw-r--r-- | src/corelib/global/qsysinfo.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index d1a4102f29..31d78bca50 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -69,7 +69,7 @@ public: LittleEndian # ifdef Q_QDOC - , ByteOrder = <platform-dependent> + , ByteOrder = BigEndian or LittleEndian # elif Q_BYTE_ORDER == Q_BIG_ENDIAN , ByteOrder = BigEndian # elif Q_BYTE_ORDER == Q_LITTLE_ENDIAN @@ -109,13 +109,7 @@ public: WV_6_1 = WV_WINDOWS7, WV_6_2 = WV_WINDOWS8, WV_6_3 = WV_WINDOWS8_1, - WV_10_0 = WV_WINDOWS10, - - WV_CE = 0x0100, - WV_CENET = 0x0200, - WV_CE_5 = 0x0300, - WV_CE_6 = 0x0400, - WV_CE_based = 0x0f00 + WV_10_0 = WV_WINDOWS10 }; #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) static const WinVersion WindowsVersion; @@ -127,6 +121,7 @@ public: #define Q_MV_OSX(major, minor) (major == 10 ? minor + 2 : (major == 9 ? 1 : 0)) #define Q_MV_IOS(major, minor) (QSysInfo::MV_IOS | major << 4 | minor) +#define Q_MV_TVOS(major, minor) (QSysInfo::MV_TVOS | major << 4 | minor) enum MacVersion { MV_None = 0xffff, MV_Unknown = 0x0000, @@ -180,7 +175,14 @@ public: MV_IOS_9_1 = Q_MV_IOS(9, 1), MV_IOS_9_2 = Q_MV_IOS(9, 2), MV_IOS_9_3 = Q_MV_IOS(9, 3), - MV_IOS_10_0 = Q_MV_IOS(10, 0) + MV_IOS_10_0 = Q_MV_IOS(10, 0), + + /* tvOS */ + MV_TVOS = 1 << 9, + MV_TVOS_9_0 = Q_MV_TVOS(9, 0), + MV_TVOS_9_1 = Q_MV_TVOS(9, 1), + MV_TVOS_9_2 = Q_MV_TVOS(9, 2), + MV_TVOS_10_0 = Q_MV_TVOS(10, 0) }; #if defined(Q_OS_MAC) static const MacVersion MacintoshVersion; |