diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 19:36:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-12-03 19:36:29 +0100 |
| commit | 90d3044e3a6ad58819be6787b5edcbc9daa948dc (patch) | |
| tree | 27d54322988fe60a420bbb058608b9b9d637329b /src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | |
| parent | 03301c0fbdf034fb987e1c1ed1bec7c206dcd27e (diff) | |
| parent | d0ae9b50cc01e4c0f65f17467276d4af40284ae1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
Diffstat (limited to 'src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 6d3da026c..1eee2d187 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -541,9 +541,11 @@ /*! \property QWebEnginePage::requestedUrl - \brief the URL requested to be loaded by the frame currently viewed + \brief the URL that was originally requested to be loaded by the frame + that is currently viewed - The URL may differ from the one returned by url() if a DNS resolution or a redirection occurs. + \note The URL may differ from the one returned by url(), which is the actual + URL that results from DNS resolution or redirection. \sa url(), setUrl() */ |