summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-06-02 11:09:30 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2021-06-02 08:43:33 +0000
commit0c30a9849c4bf4bff9cc8c89a32d4702ac4aed2f (patch)
tree9274b06494069251b67e2ab2f91cc1fb506e0525
parente7f62ebd6bb1d047b5a9a7442cb957cefe3445d1 (diff)
downloadqtdoc-0c30a9849c4bf4bff9cc8c89a32d4702ac4aed2f.tar.gz
Update supported platforms and compilers for 6.1.1 branch
Task-number: QTBUG-93517 Pick-to: 6.1 Change-Id: I568ebb8d9d1e5a2ecf5d2a1944599d398af2b8cb Reviewed-by: Ville Voutilainen <ville.voutilainen@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 e36446bb..7790e7ad 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -35,7 +35,7 @@
//! [linux]
\table 80%
\header \li Distribution \li Architecture \li Compiler \li Notes
- \row \li CentOS Linux 8.1
+ \row \li CentOS Linux 8.3
\li \c x86_64
\li GCC 9
\li
@@ -64,7 +64,7 @@
\header \li Target Platform \li Architecture \li Build Environment
\row \li \macos 10.14, 10.15, 11.0
\li \c x86_64 and \c x86_64h
- \li Xcode 12 (10.15 SDK)
+ \li Xcode 12 (11.1 SDK)
\endtable
//! [macos]
@@ -91,7 +91,7 @@
\header \li Distribution \li Architecture \li Compiler \li Notes
\row \li Android 6.0 or later (API level 23 or higher)
\li \c armv7a, \c x86, \c arm64-v8, and \c x86_64
- \li Clang 9.0.8 (NDK r21) and Clang 8.0.7 (NDK r20b) as provided
+ \li Clang 11.0.5 (NDK r22b), Clang 9.0.8 (NDK r21) and Clang 8.0.7 (NDK r20b) as provided
by Google, MinGW 8.1
\li
\endtable