diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 11:45:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 11:45:39 (GMT) |
| commit | 8b533a7564c634e6e7228c5e02832d55513777b5 (patch) | |
| tree | b872a39d60fb130df00a1f6ded19140dec73c9c4 /src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| parent | 8c316faaeb6efdc82d3c17e03bd0e83da9783e6f (diff) | |
| download | Qt-8b533a7564c634e6e7228c5e02832d55513777b5.zip Qt-8b533a7564c634e6e7228c5e02832d55513777b5.tar.gz Qt-8b533a7564c634e6e7228c5e02832d55513777b5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Added lisence header to snippet
Doc: Fixing QTBUG-13595
Fix compile warnings (unused variables).
Removing libconninet 3rdparty component.
Closes properly the dbus connection in icd backend
Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD.
Added my changes to the changelog.
Clarified documentation of loadFinished() signal.
Added a condition to skip obsolete functions during the threadness check.
Doc: call qApp->precessEvents after QSplashScreen::showMessage
Doc: Said that QApplication exits when not able to open X11 display
Doc: maintainance - fixing grammar and spelling
Doc: Added a note to qmake INSTALLS docs
Doc: Fixing overlapping text problem in columns
Doc: Added info on QWidget::render to printing docs
Added default value documentation for two variables.
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp')
| -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 |