diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-10 17:04:38 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-10 23:39:45 +0100 |
| commit | 4b2035cd0f9a7c289c7a9e470fde83dae9351092 (patch) | |
| tree | 3e9b68c46575a0983bdacca29b1f3af3bdd5c4f2 | |
| parent | 346d30144a3d110eb5b0b1dd1902c72fafa794e2 (diff) | |
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.
Pick-to: 6.1
Task-number: QTCREATORBUG-23574
Change-Id: I3046384164f2d7fdbd0cfd16dcb85e0d60bc56ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | cmake/QtAutoDetect.cmake | 6 | ||||
| -rw-r--r-- | mkspecs/common/macx.conf | 4 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/macx-tvos-clang/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/macx-watchos-clang/qmake.conf | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 85b1abac02..d3173dfad0 100644 --- a/cmake/QtAutoDetect.cmake +++ b/cmake/QtAutoDetect.cmake @@ -297,11 +297,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 index 1b8bbbe047..2979868c81 100644 --- 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 index b164d44d9f..d0fa6a20b8 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 = 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 index ad53627c4a..f3bd4ad410 100644 --- 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 index 6a1fb253c1..ad4be38473 100644 --- 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 |