diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-08-21 15:01:16 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-21 19:24:00 (GMT) |
| commit | 29f11bf9316cda91ab7392e664fca97a08e73b70 (patch) | |
| tree | 4c87eba3abe2a4f109351216803790d9f09f750f | |
| parent | f281e618eea345bcfe3b700974a0cacda1b884a0 (diff) | |
| download | Qt-29f11bf9316cda91ab7392e664fca97a08e73b70.zip Qt-29f11bf9316cda91ab7392e664fca97a08e73b70.tar.gz Qt-29f11bf9316cda91ab7392e664fca97a08e73b70.tar.bz2 | |
Update for OS X Mavericks.
(Qt 4 equivalent of qtbase/bd97768ae54d643270e824f74d152892dbea1b9f)
Change-Id: I7ecebd2e185d61a0baeb5b47b802c2f760edeff3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index a3e64c9..b165575 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1166,7 +1166,7 @@ bool qSharedBuild() \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. @@ -1178,8 +1178,9 @@ bool qSharedBuild() \value MV_10_4 Mac OS X 10.4 \value MV_10_5 Mac OS X 10.5 \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 @@ -1191,6 +1192,7 @@ bool qSharedBuild() \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, SymbianVersion */ diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 708b270..b28e51c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -327,6 +327,9 @@ namespace QT_NAMESPACE {} # if !defined(MAC_OS_X_VERSION_10_8) # define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1 # endif +# if !defined(MAC_OS_X_VERSION_10_9) +# define MAC_OS_X_VERSION_10_9 MAC_OS_X_VERSION_10_8 + 1 +# endif #endif #ifdef __LSB_VERSION__ @@ -1624,6 +1627,7 @@ public: MV_10_6 = 0x0008, MV_10_7 = 0x0009, MV_10_8 = 0x000A, + MV_10_9 = 0x000B, /* codenames */ MV_CHEETAH = MV_10_0, @@ -1634,7 +1638,8 @@ public: MV_LEOPARD = MV_10_5, MV_SNOWLEOPARD = MV_10_6, MV_LION = MV_10_7, - MV_MOUNTAINLION = MV_10_8 + MV_MOUNTAINLION = MV_10_8, + MV_MAVERICKS = MV_10_9 }; static const MacVersion MacintoshVersion; #endif |