diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-08-04 11:54:19 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-08-08 13:51:43 +0000 |
| commit | 441d1522d8a1386e83dba47507de8a4379a6bdec (patch) | |
| tree | 6bc86f824d268edc44f2c6f75a82c592dee30a96 | |
| parent | 801356387748f237b7dc24f9772774573fd83ef0 (diff) | |
Doc: Move "Target Platforms" to deployment topic from "Platform Notes"
Change-Id: I178260c8356afaada989abfb2a1218d4ce0f134e
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-deploying.qdoc | 14 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 13 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/webengine/doc/src/qtwebengine-deploying.qdoc b/src/webengine/doc/src/qtwebengine-deploying.qdoc index 7286cc780..1336cdbfd 100644 --- a/src/webengine/doc/src/qtwebengine-deploying.qdoc +++ b/src/webengine/doc/src/qtwebengine-deploying.qdoc @@ -42,6 +42,20 @@ For more information on deploying Qt applications, please see \l {Deploying Qt Applications}. + \section1 Target Platforms + + Qt WebEngine does try to support all \l{Supported Platforms} of Qt. However, + due to different requirements of Chromium this is not always possible. Known + limitations are: + + \list + \li Qt WebEngine currently supports only Windows, Linux, and OS X. + + \li On Windows, Qt WebEngine only supports Windows Vista or newer as + target platform. Due to use of newer API in Chromium, Windows XP is + not supported. WinRT is not supported, either. + \endlist + \section1 Deploying Qt WebEngine Applications on Windows If your application depends on Qt WebEngine, you must deploy diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 66e733fa9..f16258354 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -31,19 +31,6 @@ \brief Contains information about issues that are specific to the Qt WebEngine module. - \section1 Target Platforms - - Qt WebEngine does try to support all \l{Supported Platforms} of Qt. However, due to - different requirements of Chromium this is not always possible. Known limitations are: - - \list - \li Qt WebEngine currently supports only Windows, Linux, and OS X. - - \li On Windows, Qt WebEngine only supports Windows Vista or newer as target platform. - Due to use of newer API in Chromium, Windows XP is not supported. WinRT is - not supported, either. - \endlist - \section1 Building Qt WebEngine from Source Static builds are not supported. |