diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-24 15:50:04 (GMT) |
---|---|---|
committer | Jerome Pasion <jerome.pasion@nokia.com> | 2010-09-24 15:50:04 (GMT) |
commit | 84d278501a19eaccf9a77cccd95ca5d17a2dcd2b (patch) | |
tree | 5ed44d578297f4205182d26ed2d958302678194d /src/3rdparty | |
parent | d8c1fd7fb34df0be32ab3b1edc7bac1e944b9c00 (diff) | |
download | Qt-84d278501a19eaccf9a77cccd95ca5d17a2dcd2b.zip Qt-84d278501a19eaccf9a77cccd95ca5d17a2dcd2b.tar.gz Qt-84d278501a19eaccf9a77cccd95ca5d17a2dcd2b.tar.bz2 |
Clarified documentation of loadFinished() signal.
Reviewed-by:David Boddie
Task: QTBUG-10178
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index d0c047d..9b97c8b 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1890,9 +1890,10 @@ InspectorController* QWebPagePrivate::inspectorController() The loadStarted() signal is emitted when the page begins to load.The loadProgress() signal, on the other hand, is emitted whenever an element of the web page completes loading, such as an embedded image, a script, - etc. Finally, the loadFinished() signal is emitted when the page has - loaded completely. Its argument, either true or false, indicates whether - or not the load operation succeeded. + etc. Finally, the loadFinished() signal is emitted when the page contents + are loaded completely, independent of script execution or page rendering. + Its argument, either true or false, indicates whether or not the load + operation succeeded. \section1 Using QWebPage in a Widget-less Environment @@ -3729,7 +3730,7 @@ quint64 QWebPage::bytesReceived() const /*! \fn void QWebPage::loadStarted() - This signal is emitted when a new load of the page is started. + This signal is emitted when a page starts loading content. \sa loadFinished() */ @@ -3748,7 +3749,8 @@ quint64 QWebPage::bytesReceived() const /*! \fn void QWebPage::loadFinished(bool ok) - This signal is emitted when a load of the page is finished. + This signal is emitted when the page finishes loading content. This signal + is independant of script execution or page rendering. \a ok will indicate whether the load was successful or any error occurred. \sa loadStarted(), ErrorPageExtension |