diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 10:52:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 10:52:33 +0100 |
| commit | c2687689ba42d6021ae3f220d9fd240609489d3a (patch) | |
| tree | e96236e1590d9197200c4c51a1a353197a9de385 /src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | |
| parent | 6d5b9ba008bba20f1c0a1642af5f5b7182f3e890 (diff) | |
| parent | 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
src/3rdparty
Change-Id: Icbe7ea849b6ccdcee1ea1beccf86309ffb1ed578
Diffstat (limited to 'src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc index 07fb5f1cd..d7ecdb246 100644 --- a/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebengineview_lgpl.qdoc @@ -311,7 +311,7 @@ /*! \fn void QWebEngineView::titleChanged(const QString &title) - This signal is emitted whenever the \a title of the main frame changes. + This signal is emitted whenever the \a title of the view changes. \sa title() */ @@ -360,10 +360,9 @@ /*! \fn void QWebEngineView::loadProgress(int progress) - This signal is emitted every time an element in the web page - completes loading and the overall loading progress advances. - - This signal tracks the progress of all child frames. + This signal is emitted every time an element in the web view + completes loading, such as an embedded image or a script. Therefore, it + tracks the collective progress of loading the web view. The current value is provided by \a progress and scales from 0 to 100, which is the default range of QProgressBar. |