summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-03-07 15:08:47 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2022-03-14 14:05:14 +0200
commit176175e79a37184629f9f7e08aa159ec8d233b56 (patch)
treed3854fdfc4ce26b43dd66ba3f67854808683e5f9
parent69366afd3c6b46227812d6b65b9ae1940766ca82 (diff)
downloadqtdoc-176175e79a37184629f9f7e08aa159ec8d233b56.tar.gz
Update supported platforms and compilers for lts-5.15.9
Task-number: QTBUG-99909 Change-Id: I07a4e40e55b8e716f78205cad265b943170f161c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc18
1 files changed, 13 insertions, 5 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 1edb4c7f..acacdf87 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -43,6 +43,10 @@
\li \c x86_64
\li GCC 5 or later, \b {GCC 10}
\li
+ \row \li Red Hat Enterprise Linux 8.4
+ \li \c x86_64
+ \li \b {GCC 10.1 via gcc-toolset-10}
+ \li
\row \li Red Hat Enterprise Linux 7.6
\li \c x86_64
\li \b {GCC 5.3.1 via devtoolset-4}
@@ -63,8 +67,8 @@
\table 80%
\header \li Target Platform \li Architecture \li Build Environment
\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 {Xcode 12} (11 SDK)
+ \li \c x86_64 and \c x86_64h and \c arm64
+ \li Xcode 11 or Xcode 12 or \b {Xcode 13} (12 SDK)
\endtable
//! [macos]
@@ -72,7 +76,11 @@
//! [windows]
\table 80%
\header \li Operating System \li Architecture \li Compiler \li Notes
- \row \li Windows 10
+ \row \li Windows 11 21H2
+ \li \c x86 and \c x86_64
+ \li {MSVC 2019}
+ \li
+ \row \li Windows 10 21H2
\li \c x86 and \c x86_64
\li \b {MSVC 2019}, MSVC 2017, MSVC 2015, MinGW 8.1
\li
@@ -100,7 +108,7 @@
\row \li Android 5.0 or later (that is, API Level 21 and up)
\li \c armv7a and \c x86, \c arm64-v8 and \c x86_64
\li \b {Clang as provided by Google}, \b {MinGW 8.1}
- \li \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)}
+ \li {RHEL 8.x (x86_64)}, \b {RHEL 7.x (x86_64)}, \b{\macos 10.15}, \b {Windows 10 (x86_64)}
\endtable
//! [android]