From 203ce7c5ce36f300750607b74b2d2429be2d4959 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Fri, 30 May 2014 17:38:13 -0400
Subject: [PATCH] Update for the newest Darwin-family operating systems.

Change-Id: Ieca4b3841d0d652b5e9b819209f883773c2e7c74
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qglobal.cpp        |  6 ++++++
 src/corelib/global/qsysinfo.h         |  5 ++++-
 src/corelib/global/qsystemdetection.h | 12 ++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 100c1eb864..726117b515 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1108,6 +1108,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
     \value MV_10_7     OS X 10.7
     \value MV_10_8     OS X 10.8
     \value MV_10_9     OS X 10.9
+    \value MV_10_10    OS X 10.10
     \value MV_Unknown  An unknown and currently unsupported platform
 
     \value MV_CHEETAH  Apple codename for MV_10_0
@@ -1120,6 +1121,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
     \value MV_LION     Apple codename for MV_10_7
     \value MV_MOUNTAINLION Apple codename for MV_10_8
     \value MV_MAVERICKS    Apple codename for MV_10_9
+    \value MV_YOSEMITE     Apple codename for MV_10_10
 
     \value MV_IOS      iOS (any)
     \value MV_IOS_4_3  iOS 4.3
@@ -1129,6 +1131,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
     \value MV_IOS_6_1  iOS 6.1
     \value MV_IOS_7_0  iOS 7.0
     \value MV_IOS_7_1  iOS 7.1
+    \value MV_IOS_8_0  iOS 8.0
 
     \sa WinVersion
 */
@@ -2409,6 +2412,9 @@ QString QSysInfo::prettyOsName()
     case MV_MAVERICKS:
         basename = "OS X Mavericks (";
         break;
+    case MV_YOSEMITE:
+        basename = "OS X Yosemite (";
+        break;
     }
     if (basename)
         return QLatin1String(basename) + osVersion() + QLatin1Char(')');
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h
index 7b41bf25ce..610533ef19 100644
--- a/src/corelib/global/qsysinfo.h
+++ b/src/corelib/global/qsysinfo.h
@@ -136,6 +136,7 @@ public:
         MV_10_7 = 0x0009,
         MV_10_8 = 0x000A,
         MV_10_9 = 0x000B,
+        MV_10_10 = 0x000C,
 
         /* codenames */
         MV_CHEETAH = MV_10_0,
@@ -148,6 +149,7 @@ public:
         MV_LION = MV_10_7,
         MV_MOUNTAINLION = MV_10_8,
         MV_MAVERICKS = MV_10_9,
+        MV_YOSEMITE = MV_10_10,
 
         /* iOS */
         MV_IOS     = 1 << 8,
@@ -157,7 +159,8 @@ public:
         MV_IOS_6_0 = Q_MV_IOS(6, 0),
         MV_IOS_6_1 = Q_MV_IOS(6, 1),
         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)
     };
     static const MacVersion MacintoshVersion;
     static MacVersion macVersion();
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index 0431e10133..b2e99ac259 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -235,6 +235,9 @@
 #  if !defined(__MAC_10_9)
 #       define __MAC_10_9 1090
 #  endif
+#  if !defined(__MAC_10_10)
+#       define __MAC_10_10 101000
+#  endif
 #  if !defined(MAC_OS_X_VERSION_10_7)
 #       define MAC_OS_X_VERSION_10_7 1070
 #  endif
@@ -244,6 +247,9 @@
 #  if !defined(MAC_OS_X_VERSION_10_9)
 #       define MAC_OS_X_VERSION_10_9 1090
 #  endif
+#  if !defined(MAC_OS_X_VERSION_10_10)
+#       define MAC_OS_X_VERSION_10_10 101000
+#  endif
 #
 #  if !defined(__IPHONE_4_3)
 #       define __IPHONE_4_3 40300
@@ -263,6 +269,12 @@
 #  if !defined(__IPHONE_7_0)
 #       define __IPHONE_7_0 70000
 #  endif
+#  if !defined(__IPHONE_7_1)
+#       define __IPHONE_7_1 70100
+#  endif
+#  if !defined(__IPHONE_8_0)
+#       define __IPHONE_8_0 80000
+#  endif
 #endif
 
 #ifdef __LSB_VERSION__