summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-09-24 09:42:30 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2021-09-24 12:43:39 +0300
commit41a6bc7f1a28646c1e436af01e06324eacba560c (patch)
treeed07dfbeed45cc0cf773ec4dad4708867bd5c2e6
parentd935ce21d6774b49e0452e14629732c2f0780947 (diff)
downloadqtdoc-41a6bc7f1a28646c1e436af01e06324eacba560c.tar.gz
Update supported platforms and compilers for 6.2.0 branch
Task-number: QTBUG-92631 Change-Id: I7d18b56d8a687a744de74a115a677b72cd017b65 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 961d8913..d6d04c19 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
@@ -64,7 +64,7 @@
\header \li Target Platform \li Architecture \li Build Environment
\row \li \macos 10.14, 10.15, 11
\li \c x86_64, \c x86_64h, and \c arm64
- \li Xcode 12 (11 SDK)
+ \li Xcode 12 (11.1 SDK)
\endtable
//! [macos]
@@ -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]