diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-03-10 17:04:38 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-12 14:43:31 +0000 |
commit | 0680c87856da963573a4463ea99caf1fd2abf328 (patch) | |
tree | 52d7fdda2ca4a81e8a6cc21b4a4eae703c4b572b /cmake | |
parent | e2a11171ab927b6fcb2afa5644598bbe3f389b79 (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.
Task-number: QTCREATORBUG-23574
Change-Id: I3046384164f2d7fdbd0cfd16dcb85e0d60bc56ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 4b2035cd0f9a7c289c7a9e470fde83dae9351092)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/QtAutoDetect.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtAutoDetect.cmake b/cmake/QtAutoDetect.cmake index 36761dba35..7a1845d74c 100644 --- 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}") |