Bump Apple platform minimum versions

Includes both minimum deployment targets and minimum sdk versions. As per supported Apple platforms versions which was done in qt/qtdoc at 8807fdedce29cbbd7662fcd745234da30eace3fb For Qt for iOS 6.0.x we only bump the minimum deloyment target because applications seem to crash with iOS 12.4+, and it's better to have a build error than a runtime error. The minimum required sdk will not be bumped for 6.0.x, so we don't accidentally break someone's existing build, given that 6.0 is already released. Task-number: QTCREATORBUG-23574 Change-Id: I3046384164f2d7fdbd0cfd16dcb85e0d60bc56ce Reviewed-by: Tor Arne Vestbø <[email protected]> (cherry picked from commit 4b2035c) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
chain78 · Mar 12, 2021 · 0680c87 · 0680c87
1 parent e2a1117
commit 0680c87
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake
@@ -268,11 +268,11 @@ function(qt_auto_detect_darwin)
                 # macOS
                 set(version "10.14")
             elseif(CMAKE_SYSTEM_NAME STREQUAL iOS)
-                set(version "12.0")
+                set(version "13.0")
             elseif(CMAKE_SYSTEM_NAME STREQUAL watchOS)
-                set(version "5.0")
+                set(version "6.0")
             elseif(CMAKE_SYSTEM_NAME STREQUAL tvOS)
-                set(version "12.0")
+                set(version "13.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
@@ -7,9 +7,7 @@ QMAKE_MAC_SDK           = macosx
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
 
-# Should be 10.15, but as long as the CI builds with
-# older SDKs we have to keep this.
-QT_MAC_SDK_VERSION_MIN = 10.14
+QT_MAC_SDK_VERSION_MIN = 10.15
 
 QT_MAC_SDK_VERSION_MAX = 11.0
 

diff --git 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 = 12.0
+QMAKE_IOS_DEPLOYMENT_TARGET = 13.0
 
 # Universal target (iPhone and iPad)
 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 1,2

diff --git a/mkspecs/macx-tvos-clang/qmake.conf b/mkspecs/macx-tvos-clang/qmake.conf
@@ -2,7 +2,7 @@
 # qmake configuration for macx-tvos-clang
 #
 
-QMAKE_TVOS_DEPLOYMENT_TARGET    = 12.0
+QMAKE_TVOS_DEPLOYMENT_TARGET    = 13.0
 
 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 3
 

diff --git a/mkspecs/macx-watchos-clang/qmake.conf b/mkspecs/macx-watchos-clang/qmake.conf
@@ -2,7 +2,7 @@
 # qmake configuration for macx-watchos-clang
 #
 
-QMAKE_WATCHOS_DEPLOYMENT_TARGET    = 5.0
+QMAKE_WATCHOS_DEPLOYMENT_TARGET    = 6.0
 
 QMAKE_APPLE_TARGETED_DEVICE_FAMILY = 4