summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-09-18 15:53:33 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-09-18 15:53:33 +0200
commit6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2 (patch)
treed9c68d1cca0b3e352f1e438561f3e504e641a08f /Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
parentd0424a769059c84ae20beb3c217812792ea6726b (diff)
downloadqtwebkit-6bbb7fbbac94d0f511a7bd0cbd50854ab643bfb2.tar.gz
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit.org/repository/webkit/trunk@128886)
New snapshot with various build fixes
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp')
-rw-r--r--Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
index 39f314c3b..eebf20d76 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
@@ -40,15 +40,16 @@ public:
};
/*!
- \qmlclass WebLoadRequest QWebLoadRequest
+ \qmltype WebLoadRequest
+ \instantiates QWebLoadRequest
+ \inqmlmodule QtWebKit 3.0
+
\brief A utility class for the WebView::loadingChanged signal.
This class contains information about a requested load of a web page, like the URL and
current loading status (started, finished, failed).
- \sa WebView::loadingChanged(WebLoadRequest)
-
- \inqmlmodule QtWebKit 3.0
+ \sa WebView::onLoadingChanged
*/
QWebLoadRequest::QWebLoadRequest(const QUrl& url, QQuickWebView::LoadStatus status, const QString& errorString, QQuickWebView::ErrorDomain errorDomain, int errorCode, QObject* parent)
: QObject(parent)
@@ -80,7 +81,8 @@ QUrl QWebLoadRequest::url() const
\li WebView::LoadFailedStatus - the page has failed loading.
\endlist
- \sa WebLoadRequest, WebView::loadingChanged(WebLoadRequest)
+ \sa WebLoadRequest
+ \sa WebView::onLoadingChanged
*/
QQuickWebView::LoadStatus QWebLoadRequest::status() const
{