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

Bump macOS and iOS deployment targets to 10.15 and 14 respectively

Browse Source 
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:
Tor Arne Vestbø 2022-08-02 18:03:53 +02:00
parent ecbbb75585
commit 30489eb661
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/QtAutoDetect.cmake
View File

@ -352,13 +352,13 @@ function(qt_auto_detect_darwin)
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
if(NOT CMAKE_SYSTEM_NAME) if(NOT CMAKE_SYSTEM_NAME)
# macOS # macOS
set(version "10.14") set(version "10.15")
elseif(CMAKE_SYSTEM_NAME STREQUAL iOS) elseif(CMAKE_SYSTEM_NAME STREQUAL iOS)
set(version "13.0") set(version "14.0")
elseif(CMAKE_SYSTEM_NAME STREQUAL watchOS) elseif(CMAKE_SYSTEM_NAME STREQUAL watchOS)
set(version "6.0") set(version "7.0")
elseif(CMAKE_SYSTEM_NAME STREQUAL tvOS) elseif(CMAKE_SYSTEM_NAME STREQUAL tvOS)
set(version "13.0") set(version "14.0")
endif() endif()
if(version) if(version)
set(CMAKE_OSX_DEPLOYMENT_TARGET "${version}" CACHE STRING "${description}") set(CMAKE_OSX_DEPLOYMENT_TARGET "${version}" CACHE STRING "${description}")

2
mkspecs/common/macx.conf
View File

@ -5,7 +5,7 @@
QMAKE_PLATFORM += macos osx macx QMAKE_PLATFORM += macos osx macx
QMAKE_MAC_SDK = macosx QMAKE_MAC_SDK = macosx
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
QT_MAC_SDK_VERSION_MIN = 11 QT_MAC_SDK_VERSION_MIN = 11

2
mkspecs/macx-ios-clang/qmake.conf
View File

@ -2,7 +2,7 @@
# qmake configuration for macx-ios-clang # qmake configuration for macx-ios-clang
# #
QMAKE_IOS_DEPLOYMENT_TARGET = 13.0 QMAKE_IOS_DEPLOYMENT_TARGET = 14.0
# Universal target (iPhone and iPad) # Universal target (iPhone and iPad)
QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2