diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2021-10-18 09:31:56 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-10-19 10:29:08 +0000 |
commit | 7ed7eb0ac9fd480d1bacf384d113e3e36560dff5 (patch) | |
tree | b9a450d86ea502b487b57027f6893d77c1d34ddd | |
parent | 1214e909e073f7d9ac0b4953ecbe79faa3b40fc4 (diff) | |
download | qtdoc-7ed7eb0ac9fd480d1bacf384d113e3e36560dff5.tar.gz |
Update supported platforms and compilers for 6.2.1 branch
Task-number: QTBUG-97339
Change-Id: Ia6d7565178c3120792c43977239106109725af92
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit ff08f6287cc1d7807e7e36486c90be6e4e316178)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | doc/src/platforms/supported-platforms.qdocinc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index 010320e0..04726e27 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,11 +35,11 @@ //! [linux] \table 80% \header \li Distribution \li Architecture \li Compiler \li Notes - \row \li CentOS Linux 8.1 + \row \li CentOS Linux 8.2 \li \c x86_64 - \li GCC 9 + \li GCC 10 (toolset) \li - \row \li openSUSE 15.2 + \row \li openSUSE 15.3 \li \c x86_64 \li GCC 9 \li @@ -95,8 +95,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 - by Google, MinGW 8.1 + \li Clang 11.0.5 (NDK r22b) as provided by Google, MinGW 8.1 \li \endtable //! [android] |