diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
| commit | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (patch) | |
| tree | 57afb359e42aa922c4ca31666aab1ee7d49c9212 /src/webengine/api/qquickwebengineloadrequest.cpp | |
| parent | 765f9c6630afcd9d022e30ffdbe909fbf1ea9549 (diff) | |
| parent | b7fde78d7822ed7f2221acfd9db15b3ff579e29d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
Diffstat (limited to 'src/webengine/api/qquickwebengineloadrequest.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineloadrequest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebengineloadrequest.cpp b/src/webengine/api/qquickwebengineloadrequest.cpp index 74043c302..47ec17c16 100644 --- a/src/webengine/api/qquickwebengineloadrequest.cpp +++ b/src/webengine/api/qquickwebengineloadrequest.cpp @@ -97,9 +97,10 @@ QUrl QQuickWebEngineLoadRequest::url() const This enumeration represents the load status of a web page load request: - \value WebEngineView::LoadStartedStatus Page is currently loading. - \value WebEngineView::LoadSucceededStatus Page has been loaded with success. - \value WebEngineView::LoadFailedStatus Page could not be loaded. + \value WebEngineLoadRequest.LoadStartedStatus Page is currently loading. + \value WebEngineLoadRequest.LoadSucceededStatus + Page has been loaded with success. + \value WebEngineLoadRequest.LoadFailedStatus Page could not be loaded. \sa WebEngineView::loadingChanged */ |