summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-09-14 12:41:36 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2021-09-14 16:05:58 +0200
commit5c3cd1b83cb29344ebf8dddce7d8e5313f9cf25e (patch)
tree73f85b5f86e702430e1230d08845747bf28c3703
parent3ca984a91a73b38ec22861bd758202eb233d1abc (diff)
downloadqtdoc-5c3cd1b83cb29344ebf8dddce7d8e5313f9cf25e.tar.gz
Update supported macOS and iOS platforms
We now test 5.15 on macOS 11 in CI, so we can comfortably say it's supported. iOS 14 has been verified to work as expected, so we assume it's no less supported than iOS 13. Change-Id: I0d628517ed6e1175f96186ea63aed01b6075482a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 26bcea94..2e31c871 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -62,9 +62,9 @@
//! [macos]
\table 80%
\header \li Target Platform \li Architecture \li Build Environment
- \row \li \macos 10.13, 10.14, \b 10.15
+ \row \li \macos 10.13, \macos 10.14, \macos 10.15, \macos 11
\li \c x86_64 and \c x86_64h
- \li Xcode 11 or \b 12 (11.1 SDK)
+ \li Xcode 11 or \b {Xcode 12} (11 SDK)
\endtable
//! [macos]
@@ -108,9 +108,9 @@
//! [ios]
\table 80%
\header \li Target Platform \li Architecture \li Build Environment \li Notes
- \row \li iOS 12, \b{iOS 13}
+ \row \li iOS 12, iOS 13, iOS 14
\li \c armv8 (\c arm64)
- \li \b {Xcode 11} (iOS 13.2 SDK)
+ \li Xcode 11 (iOS 13.2 SDK), \b {Xcode 12} (iOS 14 SDK)
\li
\row \li tvOS 12, tvOS 13
\li \c armv8 (\c arm64)