diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2021-06-02 11:09:30 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-02 10:32:30 +0000 |
commit | 4b8c0d16141f2189ccc6b293ffff1ccc354de852 (patch) | |
tree | f466df1a7de76591cbfbaefea8e1244447b72a17 | |
parent | bdf7a4dbf4ebd7334ee63443fc1800d025349014 (diff) | |
download | qtdoc-4b8c0d16141f2189ccc6b293ffff1ccc354de852.tar.gz |
Update supported platforms and compilers for 6.1.1 branch
Task-number: QTBUG-93517
Change-Id: I568ebb8d9d1e5a2ecf5d2a1944599d398af2b8cb
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 0c30a9849c4bf4bff9cc8c89a32d4702ac4aed2f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | doc/src/platforms/supported-platforms.qdocinc | 8 |
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 |