diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-05-01 23:35:06 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-05-03 01:52:03 +0000 |
| commit | ca1077ce4bf67e9fc72362c203c1ae38ea4f8df1 (patch) | |
| tree | 02aacd462779f289d774f2347eda9b18840e7bae /src/corelib | |
| parent | 78a10bb8dcdbcc89b4011067016d86f61ae0213d (diff) | |
Update for the newest Darwin-family operating systems.
Change-Id: I72ba0554eb9e1201ce3844d6420f253c51750de3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/global/qsysinfo.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 9 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 852980121f..2176a148b0 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1152,6 +1152,9 @@ bool qSharedBuild() Q_DECL_NOTHROW \value MV_IOS_7_0 iOS 7.0 \value MV_IOS_7_1 iOS 7.1 \value MV_IOS_8_0 iOS 8.0 + \value MV_IOS_8_1 iOS 8.1 + \value MV_IOS_8_2 iOS 8.2 + \value MV_IOS_8_3 iOS 8.3 \value MV_None Not a Darwin operating system diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index a571e43568..3e93eb9965 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -160,7 +160,10 @@ public: 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_8_0 = Q_MV_IOS(8, 0) + MV_IOS_8_0 = Q_MV_IOS(8, 0), + MV_IOS_8_1 = Q_MV_IOS(8, 1), + MV_IOS_8_2 = Q_MV_IOS(8, 2), + MV_IOS_8_3 = Q_MV_IOS(8, 3) }; #if defined(Q_OS_MAC) static const MacVersion MacintoshVersion; diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 64f9d91ec7..cb662c7db1 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -270,6 +270,15 @@ # 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 #endif #ifdef __LSB_VERSION__ |