summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-12-13 23:30:53 -0800
committerJake Petroules <jake.petroules@qt.io>2017-12-19 00:11:28 +0000
commit426fde89beb751e607fd50623e888198eeca4218 (patch)
treeac68d56729dec360795e89e4d11c1ee234fd6015 /doc
parentb8556f01d711389d94cc1ccb864324b24c0e7def (diff)
downloadqtdoc-426fde89beb751e607fd50623e888198eeca4218.tar.gz
Don't imply in Supported Platforms that UWP support is mobile-only
Task-number: QTBUG-63628 Change-Id: I0dea341fd375c77e6fbd147c165a1f8170bbfafa Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc11
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index a482f93e..3b2a895c 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -66,6 +66,11 @@ Mobile Platforms: \l {Qt for Android}{Android},
\li MSVC 2017, MSVC 2015, MSVC 2013, MinGW 5.3
\li \l{https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/5.3.0/threads-posix/dwarf/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z/download}{MinGW-builds gcc 5.3.0 (32-bit)}
+ \row \li {3,1} \header \li {3,1} Universal Windows Platform (UWP)
+ \row \li UWP 10 (x86, \b x86_64, armv7)
+ \li MSVC 2017, \b {MSVC 2015}
+ \li Hosts: \b {Windows 10}
+
\row \li {3,1} \header \li {3,1} \l {Qt for Linux/X11}{Linux/X11}
\row \li openSUSE 42.1 (64-bit)
\li \b {GCC 4.8.5}
@@ -105,11 +110,7 @@ Mobile Platforms: \l {Qt for Android}{Android},
\li Hosts: 64-bit Linux, Windows
\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 MSVC 2017, \b {MSVC 2015}
- \li Hosts: \b {Windows 10}
+ Mobile Platforms: \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS}
\row \li iOS 8, 9, 10 (armv7, arm64)
\li \b {Clang as provided by Apple}
\li \b {\macos 10.10 host}