diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
| commit | 6c344184df2dd6573681a0d2022daa55b6a36f38 (patch) | |
| tree | 91493089f958b95138bdbd3f838188450e4349bb /src/webenginewidgets/doc/src | |
| parent | bfc5eb719d30decaf5c65e2747d49a6eec28794d (diff) | |
| parent | bc317d32a65eb08da7df10bec6417829533cfc3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
Diffstat (limited to 'src/webenginewidgets/doc/src')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 0eaa7cbd0..fab4827a0 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -39,7 +39,8 @@ and findText(). A page can be loaded using load() or setUrl(). Alternatively, if you have - the HTML content readily available, you can use setHtml(). + the HTML content readily available, you can use setHtml(). The GET method is + always used to load URLs. The QWebEnginePage class also offers methods to retrieve both the URL currently loaded by the page (see url()) as well as the URL originally requested diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc index feaa802d7..5a4c1b52b 100644 --- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc @@ -37,8 +37,10 @@ It can be used in various applications to display web content live from the Internet. - A \e {web site} can be loaded to a web view with the load() function. Like all - Qt widgets, the show() function must be invoked in order to display + A \e {web site} can be loaded to a web view with the load() function. The + GET method is always used to load URLs. + + Like all Qt widgets, the show() function must be invoked in order to display the web view. The snippet below illustrates this: \snippet simple/main.cpp Using QWebEngineView |