1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for the newest Darwin-family operating systems.

Browse Source 
Change-Id: I5ea44a720e01e388a8d219a89c5b0ccd8fd23146
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
This commit is contained in:
Jake Petroules 2015-06-01 09:49:04 -07:00 committed by Jani Heikkinen
parent 5ef662f1af
commit 62d7221850
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/global/qglobal.cpp
View File

@ -1128,6 +1128,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
\value MV_10_8 OS X 10.8 \value MV_10_8 OS X 10.8
\value MV_10_9 OS X 10.9 \value MV_10_9 OS X 10.9
\value MV_10_10 OS X 10.10 \value MV_10_10 OS X 10.10
\value MV_10_11 OS X 10.11
\value MV_Unknown An unknown and currently unsupported platform \value MV_Unknown An unknown and currently unsupported platform
\value MV_CHEETAH Apple codename for MV_10_0 \value MV_CHEETAH Apple codename for MV_10_0
@ -1141,6 +1142,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
\value MV_MOUNTAINLION Apple codename for MV_10_8 \value MV_MOUNTAINLION Apple codename for MV_10_8
\value MV_MAVERICKS Apple codename for MV_10_9 \value MV_MAVERICKS Apple codename for MV_10_9
\value MV_YOSEMITE Apple codename for MV_10_10 \value MV_YOSEMITE Apple codename for MV_10_10
\value MV_ELCAPITAN Apple codename for MV_10_11
\value MV_IOS iOS (any) \value MV_IOS iOS (any)
\value MV_IOS_4_3 iOS 4.3 \value MV_IOS_4_3 iOS 4.3
@ -1151,6 +1153,11 @@ bool qSharedBuild() Q_DECL_NOTHROW
\value MV_IOS_7_0 iOS 7.0 \value MV_IOS_7_0 iOS 7.0
\value MV_IOS_7_1 iOS 7.1 \value MV_IOS_7_1 iOS 7.1
\value MV_IOS_8_0 iOS 8.0 \value MV_IOS_8_0 iOS 8.0
\value MV_IOS_8_1 iOS 8.1
\value MV_IOS_8_2 iOS 8.2
\value MV_IOS_8_3 iOS 8.3
\value MV_IOS_8_4 iOS 8.4
\value MV_IOS_9_0 iOS 9.0
\value MV_None Not a Darwin operating system \value MV_None Not a Darwin operating system
@ -2738,6 +2745,9 @@ QString QSysInfo::prettyProductName()
case MV_YOSEMITE: case MV_YOSEMITE:
basename = "OS X Yosemite ("; basename = "OS X Yosemite (";
break; break;
case MV_ELCAPITAN:
basename = "OS X El Capitan (";
break;
} }
if (basename) if (basename)
return QLatin1String(basename) + productVersion() + QLatin1Char(')'); return QLatin1String(basename) + productVersion() + QLatin1Char(')');

9
src/corelib/global/qsysinfo.h
View File

@ -137,6 +137,7 @@ public:
MV_10_8 = 0x000A, MV_10_8 = 0x000A,
MV_10_9 = 0x000B, MV_10_9 = 0x000B,
MV_10_10 = 0x000C, MV_10_10 = 0x000C,
MV_10_11 = 0x000D,
/* codenames */ /* codenames */
MV_CHEETAH = MV_10_0, MV_CHEETAH = MV_10_0,
@ -150,6 +151,7 @@ public:
MV_MOUNTAINLION = MV_10_8, MV_MOUNTAINLION = MV_10_8,
MV_MAVERICKS = MV_10_9, MV_MAVERICKS = MV_10_9,
MV_YOSEMITE = MV_10_10, MV_YOSEMITE = MV_10_10,
MV_ELCAPITAN = MV_10_11,
/* iOS */ /* iOS */
MV_IOS = 1 << 8, MV_IOS = 1 << 8,
@ -160,7 +162,12 @@ public:
MV_IOS_6_1 = Q_MV_IOS(6, 1), MV_IOS_6_1 = Q_MV_IOS(6, 1),
MV_IOS_7_0 = Q_MV_IOS(7, 0), MV_IOS_7_0 = Q_MV_IOS(7, 0),
MV_IOS_7_1 = Q_MV_IOS(7, 1), MV_IOS_7_1 = Q_MV_IOS(7, 1),
MV_IOS_8_0 = Q_MV_IOS(8, 0) MV_IOS_8_0 = Q_MV_IOS(8, 0),
MV_IOS_8_1 = Q_MV_IOS(8, 1),
MV_IOS_8_2 = Q_MV_IOS(8, 2),
MV_IOS_8_3 = Q_MV_IOS(8, 3),
MV_IOS_8_4 = Q_MV_IOS(8, 4),
MV_IOS_9_0 = Q_MV_IOS(9, 0)
}; };
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
static const MacVersion MacintoshVersion; static const MacVersion MacintoshVersion;

21
src/corelib/global/qsystemdetection.h
View File

@ -233,6 +233,9 @@
# if !defined(__MAC_10_10) # if !defined(__MAC_10_10)
# define __MAC_10_10 101000 # define __MAC_10_10 101000
# endif # endif
# if !defined(__MAC_10_11)
# define __MAC_10_11 101100
# endif
# if !defined(MAC_OS_X_VERSION_10_7) # if !defined(MAC_OS_X_VERSION_10_7)
# define MAC_OS_X_VERSION_10_7 1070 # define MAC_OS_X_VERSION_10_7 1070
# endif # endif
@ -245,6 +248,9 @@
# if !defined(MAC_OS_X_VERSION_10_10) # if !defined(MAC_OS_X_VERSION_10_10)
# define MAC_OS_X_VERSION_10_10 101000 # define MAC_OS_X_VERSION_10_10 101000
# endif # endif
# if !defined(MAC_OS_X_VERSION_10_11)
# define MAC_OS_X_VERSION_10_11 101100
# endif
# #
# if !defined(__IPHONE_4_3) # if !defined(__IPHONE_4_3)
# define __IPHONE_4_3 40300 # define __IPHONE_4_3 40300
@ -270,6 +276,21 @@
# if !defined(__IPHONE_8_0) # if !defined(__IPHONE_8_0)
# define __IPHONE_8_0 80000 # define __IPHONE_8_0 80000
# endif # endif
# if !defined(__IPHONE_8_1)
# define __IPHONE_8_1 80100
# endif
# if !defined(__IPHONE_8_2)
# define __IPHONE_8_2 80200
# endif
# if !defined(__IPHONE_8_3)
# define __IPHONE_8_3 80300
# endif
# if !defined(__IPHONE_8_4)
# define __IPHONE_8_4 80400
# endif
# if !defined(__IPHONE_9_0)
# define __IPHONE_9_0 90000
# endif
#endif #endif
#ifdef __LSB_VERSION__ #ifdef __LSB_VERSION__