diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-28 07:46:47 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-28 07:46:47 +0000 |
| commit | cb6cba2b6f11ba67a93135ac1646971e71da345b (patch) | |
| tree | 441b4a02f9d03b851aa08c419c76de7c5da0b6f6 /src/corelib/global/qsystemdetection.h | |
| parent | f1b01b7d159bcf04a2b832dba36f876479669641 (diff) | |
| parent | 4dd8a63fc13cee365c58ef67fa4a4503aeceebe8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into refs/staging/5.5
Diffstat (limited to 'src/corelib/global/qsystemdetection.h')
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 64f9d91ec7..562427e4b9 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -233,6 +233,9 @@ # if !defined(__MAC_10_10) # define __MAC_10_10 101000 # endif +# if !defined(__MAC_10_11) +# define __MAC_10_11 101100 +# endif # if !defined(MAC_OS_X_VERSION_10_7) # define MAC_OS_X_VERSION_10_7 1070 # endif @@ -245,6 +248,9 @@ # if !defined(MAC_OS_X_VERSION_10_10) # define MAC_OS_X_VERSION_10_10 101000 # endif +# if !defined(MAC_OS_X_VERSION_10_11) +# define MAC_OS_X_VERSION_10_11 101100 +# endif # # if !defined(__IPHONE_4_3) # define __IPHONE_4_3 40300 @@ -270,6 +276,21 @@ # if !defined(__IPHONE_8_0) # define __IPHONE_8_0 80000 # 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 #ifdef __LSB_VERSION__ |