diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 17:18:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 18:34:14 +0200 |
| commit | 6c2a111f8c82b56388abf409a61a3e0d56a52156 (patch) | |
| tree | 0f5a7ad320f034233c065fc994980b10afe434ad /src/webengine/doc/src | |
| parent | c4fc323d0771e24ae726065cdce9eafef2c09c41 (diff) | |
| parent | d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
Diffstat (limited to 'src/webengine/doc/src')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-features.qdoc | 2 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 12 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/webengine/doc/src/qtwebengine-features.qdoc b/src/webengine/doc/src/qtwebengine-features.qdoc index f55eab23b..52f7da928 100644 --- a/src/webengine/doc/src/qtwebengine-features.qdoc +++ b/src/webengine/doc/src/qtwebengine-features.qdoc @@ -138,6 +138,8 @@ the user. Note that on Windows an external GPS receiver must be connected to the application. For more information, see \l{Qt Positioning}. + Support for this feature was added in Qt 5.5.0. + \section1 Pepper Plugin API Qt WebEngine supports loading Pepper Plugin API (PPAPI) plugins if diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index d4d9af199..7ae3afaf4 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -60,16 +60,16 @@ The functionality in Qt WebEngine is divided into the following modules: \list - \li \l{Qt WebEngine Widgets} for creating widget-based web applications - \li \l{Qt WebEngine} for creating Qt Quick based web applications - \li \l{Qt WebEngine Core} for interacting with Chromium + \li \l{Qt WebEngine Widgets Module} for creating widget-based web applications + \li \l{Qt WebEngine Module} for creating Qt Quick based web applications + \li \l{Qt WebEngine Core Module} for interacting with Chromium \endlist Page rendering and JavaScript execution are separated from the GUI process into the Qt WebEngine Process. It is a library that must be shipped with the application if the Qt libraries are bundled into the application. - \section2 Qt WebEngine Widgets + \section2 Qt WebEngine Widgets Module \image qtwebenginewidgets-model.png @@ -82,7 +82,7 @@ \e cookies. Profiles can be used to isolate pages from each other. A typical use case is a dedicated profile for a \e {private browsing} mode, where no information is permanently saved. - \section2 Qt WebEngine + \section2 Qt WebEngine Module \image qtwebengine-model.png @@ -90,7 +90,7 @@ except that there is no separately accessible web engine page. The supported page functionality is integrated into the web engine view. - \section2 Qt WebEngine Core + \section2 Qt WebEngine Core Module The Qt WebEngine core is based on the \l {Chromium Project}. Chromium provides its own network and painting engines and is developed tightly together with its dependent modules, and diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index f3faac3c1..ecec53bda 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -87,6 +87,7 @@ \section2 Linux On Linux, Clang or GCC version 4.7 or later is required. + Supported configurations are \c linux-g++ and \c{linux-clang}. Qt WebEngine requires \c pkg-config to detect most of its dependencies. The following \c pkg-config files are required: |