diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:23 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 22:07:33 +0200 |
commit | ac41ad48cacac91e428181f7ededb0896ee64c40 (patch) | |
tree | 44b4afb881fd0b7aa29b0a9da22dddf8e91a4be2 /src/webengine/api/qquickwebenginedownloaditem.cpp | |
parent | 6534b09073791398bad99863821740e986915bff (diff) | |
parent | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
Diffstat (limited to 'src/webengine/api/qquickwebenginedownloaditem.cpp')
-rw-r--r-- | src/webengine/api/qquickwebenginedownloaditem.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index c0bca8977..f38af3923 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -179,13 +179,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). */ @@ -273,12 +273,16 @@ void QQuickWebEngineDownloadItem::setPath(QString path) Describes the format that is used to save a web page. - \value UnknownSaveFormat This is not a request for downloading a complete web page. - \value SingleHtmlSaveFormat The page is saved as a single HTML page. Resources such as images - are not saved. - \value CompleteHtmlSaveFormat The page is saved as a complete HTML page, for example a directory + \value WebEngineDownloadItem.UnknownSaveFormat + This is not a request for downloading a complete web page. + \value WebEngineDownloadItem.SingleHtmlSaveFormat + The page is saved as a single HTML page. Resources such as images + are not saved. + \value WebEngineDownloadItem.CompleteHtmlSaveFormat + The page is saved as a complete HTML page, for example a directory containing the single HTML page and the resources. - \value MimeHtmlSaveFormat The page is saved as a complete web page in the MIME HTML format. + \value WebEngineDownloadItem.MimeHtmlSaveFormat + The page is saved as a complete web page in the MIME HTML format. */ QQuickWebEngineDownloadItem::SavePageFormat QQuickWebEngineDownloadItem::savePageFormat() const |