diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 13:50:17 +0200 |
| commit | c9a64fda178c32ac924977ac93bf83d7e47767fe (patch) | |
| tree | beaf8671ccbce36b3d4018ce57fe9de29d40d87f /src/webenginewidgets/api | |
| parent | 10611866af8736a397371a38d6b5486ee8d28c62 (diff) | |
| parent | 44303861fd116b3a279d26300147e89a0bf8121c (diff) | |
Merge branch '5.12' into 5.13
Conflicts:
src/3rdparty
src/core/renderer/user_resource_controller.cpp
src/core/web_contents_adapter.cpp
src/webengine/doc/src/qtwebengine-overview.qdoc
Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
Diffstat (limited to 'src/webenginewidgets/api')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginedownloaditem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp index deb92bfd3..4575f2929 100644 --- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp +++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp @@ -117,7 +117,7 @@ static inline QWebEngineDownloadItem::DownloadInterruptReason toDownloadInterrup \l{QWebEngineProfile::downloadRequested}{downloadRequested} signal together with a newly created QWebEngineDownloadItem. The application can then examine this item and decide whether to accept it or not. A signal handler - must explicitly call accept() on the item for Qt WebEngine to actually start + must explicitly call accept() on the item for \QWE to actually start downloading and writing data to disk. If no signal handler calls accept(), then the download request will be automatically rejected and nothing will be written to disk. @@ -147,7 +147,7 @@ static inline QWebEngineDownloadItem::DownloadInterruptReason toDownloadInterrup \section2 Web Page Downloads In addition to normal file downloads, which consist simply of retrieving - some raw bytes from the network and writing them to disk, Qt WebEngine also + some raw bytes from the network and writing them to disk, \QWE also supports saving complete web pages, which involves parsing the page's HTML, downloading any dependent resources, and potentially packaging everything into a special file format (\l savePageFormat). To check if a download is |