diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2016-05-13 16:20:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 18:47:29 +0000 |
| commit | 1f2109f95a4714fa9b1e16179c8dba8846ef342e (patch) | |
| tree | d99ea62f5a753b0332a3ebbc24db995cb18ffdfc /src | |
| parent | 3206e85c0f7ee3de9953977ffbb0137de0ee01f3 (diff) | |
Doc: HTTP GET method is always used to load URLs
Task-number: QTBUG-53314
Change-Id: I575a740cf0cd6e788c7533f4ec87fc910f1d03fa
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webengine/doc/src/webengineview.qdoc | 7 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index 574b5e70f..2aeb88b26 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -47,8 +47,11 @@ \section2 Loading Web Pages An application can load pages into the WebEngineView, using either the \l url property or the - \l loadHtml method and navigate within the view's session history. The history is represented - by a WebEngineHistory data model that is held by the \l navigationHistory property. + \l loadHtml method and navigate within the view's session history. The GET + method is always used to load URLs. + + The history is represented by a WebEngineHistory data model that is held by + the \l navigationHistory property. The following sample QML application loads a web page using the \c url property: diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 9be4a25e7..50578a0e7 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 976a1a924..d03d64a1c 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 |