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/qquickwebenginedownloaditem.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/qquickwebenginedownloaditem.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginedownloaditem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index 247e48da5..a8467d656 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -178,13 +178,13 @@ quint32 QQuickWebEngineDownloadItem::id() const Describes the state of the download: - \value DownloadRequested + \value WebEngineDownloadItem.DownloadRequested Download has been requested, but it has not been accepted yet. - \value DownloadInProgress + \value WebEngineDownloadItem.DownloadInProgress Download is in progress. - \value DownloadCompleted + \value WebEngineDownloadItem.DownloadCompleted Download completed successfully. - \value DownloadInterrupted + \value WebEngineDownloadItem.DownloadInterrupted Download has been interrupted (by the server or because of lost connectivity). */ |