diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-14 10:08:51 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-14 11:06:37 +0200 |
| commit | bdeb81b73122d6962ca4796c573dcbc636ccb195 (patch) | |
| tree | 946530bfe0f7bd506ea26633f8374fde5180c6cb /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | 529623a9f3590ac0ac3baf3ccece793c0ce7f825 (diff) | |
| parent | c7d46325e635d1fb4482b53dce866e2c55026a7e (diff) | |
| download | qtwebengine-bdeb81b73122d6962ca4796c573dcbc636ccb195.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0860a46b981c1f711bec45d7a495bcec2a80ee1f
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 178f6ec98..76c705c6e 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1275,7 +1275,9 @@ void QWebEnginePage::triggerAction(WebAction action, bool) break; case DownloadLinkToDisk: if (menuData.linkUrl().isValid()) - d->adapter->download(menuData.linkUrl(), menuData.suggestedFileName()); + d->adapter->download(menuData.linkUrl(), menuData.suggestedFileName(), + menuData.referrerUrl(), menuData.referrerPolicy()); + break; case CopyImageToClipboard: if (menuData.hasImageContent() && @@ -1302,7 +1304,8 @@ void QWebEnginePage::triggerAction(WebAction action, bool) case DownloadImageToDisk: case DownloadMediaToDisk: if (menuData.mediaUrl().isValid()) - d->adapter->download(menuData.mediaUrl(), menuData.suggestedFileName()); + d->adapter->download(menuData.mediaUrl(), menuData.suggestedFileName(), + menuData.referrerUrl(), menuData.referrerPolicy()); break; case CopyMediaUrlToClipboard: if (menuData.mediaUrl().isValid() && @@ -1466,7 +1469,7 @@ void QWebEnginePagePrivate::wasHidden() bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData &data) { - if (!view || !view->d_func()->m_pendingContextMenuEvent) + if (!view) return false; contextData.reset(); @@ -1492,7 +1495,6 @@ bool QWebEnginePagePrivate::contextMenuRequested(const WebEngineContextMenuData event.ignore(); return false; } - view->d_func()->m_pendingContextMenuEvent = false; return true; } |