Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	configure
	mkspecs/features/create_cmake.prf

Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5

1 files changed, 6 insertions, 4 deletions

diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index e6da7bb32d..c085dbaa4d 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -1042,7 +1042,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
     \enum QSysInfo::MacVersion
 
     This enum provides symbolic names for the various versions of the
-    Macintosh operating system. On Mac, the
+    OS X operating system. On OS X, the
     QSysInfo::MacintoshVersion variable gives the version of the
     system on which the application is run.
 
@@ -1054,8 +1054,9 @@ bool qSharedBuild() Q_DECL_NOTHROW
     \value MV_10_4     Mac OS X 10.4 (unsupported)
     \value MV_10_5     Mac OS X 10.5 (unsupported)
     \value MV_10_6     Mac OS X 10.6
-    \value MV_10_7     Mac OS X 10.7
-    \value MV_10_8     Mac OS X 10.8
+    \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_Unknown  An unknown and currently unsupported platform
 
     \value MV_CHEETAH  Apple codename for MV_10_0
@@ -1067,6 +1068,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
     \value MV_SNOWLEOPARD  Apple codename for MV_10_6
     \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
 
     \sa WinVersion
 */
@@ -1694,7 +1696,7 @@ Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr) {
 
 QSysInfo::MacVersion QSysInfo::macVersion()
 {
-#ifndef Q_OS_IOS
+#ifdef Q_OS_MACX
     SInt32 gestalt_version;
     if (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) {
         return QSysInfo::MacVersion(((gestalt_version & 0x00F0) >> 4) + 2);