From 30489eb66195b84fadc422273d2454a69ffd322e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 2 Aug 2022 18:03:53 +0200 Subject: [PATCH] Bump macOS and iOS deployment targets to 10.15 and 14 respectively MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1ffaa77f3a4194d2ab02729ff525e5f831e3b7a8 Reviewed-by: Timur Pocheptsov Reviewed-by: Jörg Bornemann --- cmake/QtAutoDetect.cmake | 8 ++++---- mkspecs/common/macx.conf | 2 +- mkspecs/macx-ios-clang/qmake.conf | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 848f24ab8b3..60aa532d23c 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -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}") diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 2c1c90fd2b7..b904d75cbd2 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -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 diff --git a/mkspecs/macx-ios-clang/qmake.conf b/mkspecs/macx-ios-clang/qmake.conf index d0fa6a20b8d..683e2b255d0 100644 --- a/mkspecs/macx-ios-clang/qmake.conf +++ b/mkspecs/macx-ios-clang/qmake.conf @@ -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