diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 11:04:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-09-08 12:55:06 +0200 |
| commit | 22556f899ffd91650c1a1d5a8d71016358291859 (patch) | |
| tree | 320dfdcd26a3cd078738da5a0ab9b8ea373fde29 /src/webengine/api/qquickwebengineloadrequest.cpp | |
| parent | b715310a4fdc2a5e215c99bae042cd820e9a1e27 (diff) | |
| parent | dc16cdd60449112343d43852960142db7fd155fd (diff) | |
Merge branch '5.5' into 5.6
Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
Diffstat (limited to 'src/webengine/api/qquickwebengineloadrequest.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineloadrequest.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/webengine/api/qquickwebengineloadrequest.cpp b/src/webengine/api/qquickwebengineloadrequest.cpp index c85d0d76f..e94fa7eb9 100644 --- a/src/webengine/api/qquickwebengineloadrequest.cpp +++ b/src/webengine/api/qquickwebengineloadrequest.cpp @@ -62,10 +62,10 @@ public: \inqmlmodule QtWebEngine 1.0 \since QtWebEngine 1.0 - \brief A utility class for the WebEngineView::loadingChanged signal. + \brief A utility type for the WebEngineView::loadingChanged signal. - This class contains information about a requested load of a web page, such as the URL and - current loading status (started, finished, failed). + Contains information about a request for loading a web page, such as the URL and + current loading status (started, succeeded, failed). \sa WebEngineView::loadingChanged */ @@ -81,7 +81,7 @@ QQuickWebEngineLoadRequest::~QQuickWebEngineLoadRequest() /*! \qmlproperty url WebEngineLoadRequest::url - \brief The URL of the load request. + \brief Holds the URL of the load request. */ QUrl QQuickWebEngineLoadRequest::url() const { @@ -92,11 +92,11 @@ QUrl QQuickWebEngineLoadRequest::url() const /*! \qmlproperty enumeration WebEngineLoadRequest::status - This enumeration represents the load status of a web page load request. + This enumeration represents the load status of a web page load request: - \value WebEngineView::LoadStartedStatus The page is currently loading. - \value WebEngineView::LoadSucceededStatus The page has been loaded with success. - \value WebEngineView::LoadFailedStatus The page has failed loading. + \value WebEngineView::LoadStartedStatus Page is currently loading. + \value WebEngineView::LoadSucceededStatus Page has been loaded with success. + \value WebEngineView::LoadFailedStatus Page could not be loaded. \sa WebEngineView::loadingChanged */ @@ -108,6 +108,7 @@ QQuickWebEngineView::LoadStatus QQuickWebEngineLoadRequest::status() const /*! \qmlproperty string WebEngineLoadRequest::errorString + \brief Holds the error message. */ QString QQuickWebEngineLoadRequest::errorString() const { @@ -123,6 +124,7 @@ QQuickWebEngineView::ErrorDomain QQuickWebEngineLoadRequest::errorDomain() const /*! \qmlproperty int WebEngineLoadRequest::errorCode + \brief Holds the error code. */ int QQuickWebEngineLoadRequest::errorCode() const { |