diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:13:55 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-12-21 01:15:07 +0100 |
| commit | d3dd527c3715188e2708ebcf5189076cbff9b104 (patch) | |
| tree | 4a5c2a4e34d142c3a0cb690216a0d5df39708242 /src/webengine | |
| parent | 3bb1294bc59320e5699840e14490197d6a77b7aa (diff) | |
| parent | e2609bcba621110920d847fcfbaf7edec4ae3827 (diff) | |
Merge branch '5.8' into dev
Conflicts:
configure.json
Change-Id: I658a02de96b45b382f0f6c383964501b794b5eb6
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebenginedownloaditem.cpp | 4 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index 8a6bd0407..520839880 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -122,7 +122,7 @@ QQuickWebEngineDownloadItemPrivate::~QQuickWebEngineDownloadItemPrivate() Stores the state of a download to be used to manage requested downloads. By default, the download is rejected unless the user explicitly accepts it with - WebEngineDownloadItem::accept(). + accept(). */ void QQuickWebEngineDownloadItemPrivate::update(const BrowserContextAdapterClient::DownloadItemInfo &info) @@ -161,8 +161,6 @@ void QQuickWebEngineDownloadItemPrivate::updateState(QQuickWebEngineDownloadItem \qmlmethod void WebEngineDownloadItem::accept() Accepts the download request, which will start the download. - - \sa WebEngineDownloadItem::cancel() */ void QQuickWebEngineDownloadItem::accept() diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 6995be2fa..c3d737384 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -89,7 +89,7 @@ \l{https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md}{overview} that is part of the documentation in the \l {Chromium Project} upstream source tree. - This version of Qt WebEngine is based on Chromium version 49.0.2623.111, with + This version of Qt WebEngine is based on Chromium version 53.0.2785.148, with additional security fixes from newer versions. \section2 Qt WebEngine Process @@ -199,7 +199,7 @@ Qt WebEngine uses the proxy settings from \l{Qt Network}. If QNetworkProxy::applicationProxy is set, it will also be used for Qt WebEngine, and if - QNetworkProxy::usesSystemConfiguration() is enabled, the proxy settings are automatically + QNetworkProxyFactory::usesSystemConfiguration() is enabled, the proxy settings are automatically retrieved from the system. Settings from an installed QNetworkProxyFactory will be ignored though. |