AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update platform defines for Apple OSes

Browse Source 
macOS 10.14 (Mojave) and iOS 12 has been added, and older defines for
platforms below our deployment target have been removed.

Change-Id: Ib7b3e657d11136179b669a94da56963d4716bcb7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Tor Arne Vestbø 2018-06-08 16:19:18 +02:00 committed by Jani Heikkinen
parent 02be685084
commit 3f295f272a
1 changed files with 8 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/corelib/global/qsystemdetection.h
View File

@ -216,18 +216,6 @@
# // Numerical checks are preferred to named checks, but to be safe # // Numerical checks are preferred to named checks, but to be safe
# // we define the missing version names in case Qt uses them. # // we define the missing version names in case Qt uses them.
# #
# if !defined(__MAC_10_7)
# define __MAC_10_7 1070
# endif
# if !defined(__MAC_10_8)
# define __MAC_10_8 1080
# endif
# if !defined(__MAC_10_9)
# define __MAC_10_9 1090
# endif
# if !defined(__MAC_10_10)
# define __MAC_10_10 101000
# endif
# if !defined(__MAC_10_11) # if !defined(__MAC_10_11)
# define __MAC_10_11 101100 # define __MAC_10_11 101100
# endif # endif
@ -237,17 +225,8 @@
# if !defined(__MAC_10_13) # if !defined(__MAC_10_13)
# define __MAC_10_13 101300 # define __MAC_10_13 101300
# endif # endif
# if !defined(MAC_OS_X_VERSION_10_7) # if !defined(__MAC_10_14)
# define MAC_OS_X_VERSION_10_7 1070 # define __MAC_10_14 101400
# endif
# if !defined(MAC_OS_X_VERSION_10_8)
# define MAC_OS_X_VERSION_10_8 1080
# endif
# if !defined(MAC_OS_X_VERSION_10_9)
# define MAC_OS_X_VERSION_10_9 1090
# endif
# if !defined(MAC_OS_X_VERSION_10_10)
# define MAC_OS_X_VERSION_10_10 101000
# endif # endif
# if !defined(MAC_OS_X_VERSION_10_11) # if !defined(MAC_OS_X_VERSION_10_11)
# define MAC_OS_X_VERSION_10_11 101100 # define MAC_OS_X_VERSION_10_11 101100
@ -258,55 +237,10 @@
# if !defined(MAC_OS_X_VERSION_10_13) # if !defined(MAC_OS_X_VERSION_10_13)
# define MAC_OS_X_VERSION_10_13 101300 # define MAC_OS_X_VERSION_10_13 101300
# endif # endif
# if !defined(MAC_OS_X_VERSION_10_14)
# define MAC_OS_X_VERSION_10_14 101400
# endif
# #
# if !defined(__IPHONE_4_3)
# define __IPHONE_4_3 40300
# endif
# if !defined(__IPHONE_5_0)
# define __IPHONE_5_0 50000
# endif
# if !defined(__IPHONE_5_1)
# define __IPHONE_5_1 50100
# endif
# if !defined(__IPHONE_6_0)
# define __IPHONE_6_0 60000
# endif
# if !defined(__IPHONE_6_1)
# define __IPHONE_6_1 60100
# endif
# if !defined(__IPHONE_7_0)
# define __IPHONE_7_0 70000
# endif
# if !defined(__IPHONE_7_1)
# define __IPHONE_7_1 70100
# endif
# 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
# if !defined(__IPHONE_9_1)
# define __IPHONE_9_1 90100
# endif
# if !defined(__IPHONE_9_2)
# define __IPHONE_9_2 90200
# endif
# if !defined(__IPHONE_9_3)
# define __IPHONE_9_3 90300
# endif
# if !defined(__IPHONE_10_0) # if !defined(__IPHONE_10_0)
# define __IPHONE_10_0 100000 # define __IPHONE_10_0 100000
# endif # endif
@ -322,6 +256,9 @@
# if !defined(__IPHONE_11_0) # if !defined(__IPHONE_11_0)
# define __IPHONE_11_0 110000 # define __IPHONE_11_0 110000
# endif # endif
# if !defined(__IPHONE_12_0)
# define __IPHONE_12_0 120000
# endif
#endif #endif
#ifdef __LSB_VERSION__ #ifdef __LSB_VERSION__