summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-09-16 09:45:14 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-09-16 12:58:20 +0200
commit530a73a82518543e1432cf439dda5e0305e1224b (patch)
tree2a0b4eafd9d96e88cfd2393acf63c242ed5c0be2
parent8d14f08eaef956dba22fac12c021517d2d811c9c (diff)
Android: Add Android 9 to supported platforms
Fixes: QTBUG-78204 Change-Id: I02d5242b2e55a4739cbaa20aa48dd7600645ca2a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 8a8ab8f5c..7e05bd74e 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -100,10 +100,11 @@
//! [android]
\table 80%
\header \li Platform Version \li Architecture \li Compiler \li Build Environment
- \row \li Android 5, 6, 7, 8 (API Level 21)
- \li \c armv7 and \c x86
+ \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 7.3}
- \li \b {RHEL 7.x (x86_64)}, \b{\macos 10.13}, \b {Windows 7 (x86_64)}
+ \li \b {RHEL 7.x (x86_64)}, \b{\macos 10.13}, \b {Windows 7 (x86_64)},
+ \b {Windows 10}
\endtable
//! [android]