summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2017-05-29 10:12:01 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2017-05-30 09:34:37 +0000
commit6eb951d6182c30d3330006e584d55bf1fe96896f (patch)
tree1ad8d066637368a0b14adfbbc5c6a5f4c2071893
parentf0278ec6728e09d72eca0a76396463cf04a30d85 (diff)
downloadqtdoc-6eb951d6182c30d3330006e584d55bf1fe96896f.tar.gz
Update reference platforms in Supported Platforms
Change-Id: I1173cc8641b4fd857aaee24dfe494088a62d2feb Reviewed-by: Heikki Halmet <heikki.halmet@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 e340f225..9cfd8649 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -93,18 +93,19 @@ Mobile Platforms: \l {Qt for Android}{Android},
\row \li \l {Qt for Embedded Linux}{Embedded Linux}
\li GCC \li ARM Cortex-A, Intel boards with GCC-based toolchains
\row \li QNX 6.6.0, 7.0 (armv7le and x86)
- \li \b {QCC as provided by QNX)
- \li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)}, Windows
+ \li \b {GCC as provided by QNX}
+ \li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)},
+ \b {Windows 10 (64-bit)}, \b {Windows 7 (32-bit)}
\row \li {3,1} \header \li {3,1}
Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS},
Universal Windows Platform (UWP)
\row \li Universal Windows Platform (UWP) (x86, \b x86_64, armv7)
- \li \b {MSVC 2017}, \b {MSVC 2015}
+ \li MSVC 2017, \b {MSVC 2015}
\li Hosts: \b {Windows 10}
\row \li iOS 8, 9, 10 (armv7, arm64)
\li \b {Clang as provided by Apple}
- \li \b {\macos 10.12 host}
+ \li \b {\macos 10.10 host}
\row \li Android (API Level: 16)
\li \b {GCC as provided by Google}, \b {MinGW 5.3}
\li Hosts: \b {RHEL 7.2 (64-bit)}, \b{\macos 10.12}, \b {Windows 7 (64-bit)}