diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:52 +0200 |
| commit | 822ed893ecb973f0f42cb431b42a811a2bdcaa29 (patch) | |
| tree | bbaea2c19917366c06cb61b8b0c391a844940286 | |
| parent | dab8e210a5ed80e42499658fe662873e888d37b4 (diff) | |
| parent | 59871d2f3bdc1297696ad938fa79d891f086d8e9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ia6863344f15b4507bbe4d36aff44463362f5694e
| -rw-r--r-- | doc/src/platforms/ios.qdoc | 13 | ||||
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdocinc | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc index 5d3c7f3e9..4301c194c 100644 --- a/doc/src/platforms/ios.qdoc +++ b/doc/src/platforms/ios.qdoc @@ -42,15 +42,14 @@ using either Xcode or Qt Creator. We will look at that in more detail in the next section. - The minimum deployment target for Qt applications is iOS 5.0. Qt - then supports the following devices (iOS might need to be upgraded - on some devices). + The minimum deployment target for Qt applications is specified in + \l {Supported Platforms}. Qt then supports the following device types + (iOS might need to be upgraded on some devices). \list - \li iPhone 3GS and later - \li iPod Touch third and later generations - \li iPad 2 and later - \li iPad Mini + \li iPhone + \li iPod Touch + \li iPad \endlist \section2 Setting Up the Development Environment diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc index 5d3430237..a276de3ce 100644 --- a/doc/src/platforms/supported-platforms.qdocinc +++ b/doc/src/platforms/supported-platforms.qdocinc @@ -125,10 +125,11 @@ Mobile Platforms: \l {Qt for Android}{Android}, \header \li Platform \li Compiler \li Notes \header \li {3,1} \l {Qt for Windows}{Windows} \row \li Windows 10 (64-bit) - \li \b {MSVC 2015} + \li \b {MSVC 2015}, MSVC 2013, MSVC 2012, MSVC 2010, MinGW 4.9, + MinGW 4.8 \li \row \li Windows 10 (32-bit) - \li MSVC 2015 + \li MSVC 2015, MSVC 2013, MSVC 2012, MSVC 2010, MinGW 4.9, MinGW 4.8 \li \row \li Windows 8.1 (64-bit) \li MSVC 2015, \b {MSVC 2013}, \b {MSVC 2012}, MSVC 2010, MinGW 4.9, |