Bump macOS and iOS deployment targets to 10.15 and 14 respectively
Change-Id: I1ffaa77f3a4194d2ab02729ff525e5f831e3b7a8 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
ecbbb75585
commit
30489eb661
@ -352,13 +352,13 @@ function(qt_auto_detect_darwin)
|
||||
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
|
||||
if(NOT CMAKE_SYSTEM_NAME)
|
||||
# macOS
|
||||
set(version "10.14")
|
||||
set(version "10.15")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL iOS)
|
||||
set(version "13.0")
|
||||
set(version "14.0")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL watchOS)
|
||||
set(version "6.0")
|
||||
set(version "7.0")
|
||||
elseif(CMAKE_SYSTEM_NAME STREQUAL tvOS)
|
||||
set(version "13.0")
|
||||
set(version "14.0")
|
||||
endif()
|
||||
if(version)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "${version}" CACHE STRING "${description}")
|
||||
|
@ -5,7 +5,7 @@
|
||||
QMAKE_PLATFORM += macos osx macx
|
||||
QMAKE_MAC_SDK = macosx
|
||||
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
|
||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
|
||||
|
||||
QT_MAC_SDK_VERSION_MIN = 11
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
# qmake configuration for macx-ios-clang
|
||||
#
|
||||
|
||||
QMAKE_IOS_DEPLOYMENT_TARGET = 13.0
|
||||
QMAKE_IOS_DEPLOYMENT_TARGET = 14.0
|
||||
|
||||
# Universal target (iPhone and iPad)
|
||||
QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2
|
||||
|
Loading…
Reference in New Issue
Block a user