diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-05-30 18:08:36 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-06 21:01:27 +0200 |
| commit | d235363ed2e59604aae2f79a235b17e556a75fc0 (patch) | |
| tree | 6ea6e9fbe0559a45c2d6493670d915dae37ea93c /src | |
| parent | 7b10db33f725c78c7d2efb604998e2dc67e71d31 (diff) | |
Update for OS X Yosemite.
(Qt 4 equivalent of qtbase/203ce7c5ce36f300750607b74b2d2429be2d4959)
Change-Id: Icce8517d02dc70b545cf68a265e28083018b3225
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 45ebc00c54..aaad58ea44 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1185,6 +1185,7 @@ bool qSharedBuild() \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 @@ -1197,6 +1198,7 @@ bool qSharedBuild() \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 \sa WinVersion, SymbianVersion */ diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d3e7110957..d11202ee75 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -330,6 +330,9 @@ namespace QT_NAMESPACE {} # if !defined(MAC_OS_X_VERSION_10_9) # define MAC_OS_X_VERSION_10_9 MAC_OS_X_VERSION_10_8 + 1 # endif +# if !defined(MAC_OS_X_VERSION_10_10) +# define MAC_OS_X_VERSION_10_10 101000 +# endif #endif #ifdef __LSB_VERSION__ @@ -1630,6 +1633,7 @@ public: MV_10_7 = 0x0009, MV_10_8 = 0x000A, MV_10_9 = 0x000B, + MV_10_10 = 0x000C, /* codenames */ MV_CHEETAH = MV_10_0, @@ -1641,7 +1645,8 @@ public: MV_SNOWLEOPARD = MV_10_6, MV_LION = MV_10_7, MV_MOUNTAINLION = MV_10_8, - MV_MAVERICKS = MV_10_9 + MV_MAVERICKS = MV_10_9, + MV_YOSEMITE = MV_10_10 }; static const MacVersion MacintoshVersion; #endif |