diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2020-07-24 10:30:54 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2020-07-24 15:23:10 +0200 |
| commit | 54b84e14589b3e51f2f2e7980e2af2559601efe2 (patch) | |
| tree | eafef9f5b854cd90f6fa8e1ae5ab9e161a424aa3 /src/core/web_contents_delegate_qt.cpp | |
| parent | 27332664b2745d7d322b8afbc1a41dc0fbfc763a (diff) | |
| parent | a2a19a6965601ced75e3e48b2bf618ba2bdbd29e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/core/compositor/delegated_frame_node.cpp
src/core/core_chromium.pri
src/core/render_widget_host_view_qt.cpp
Change-Id: I9387151e9647c87fc387095e7b6d8d66560cdf71
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 77dd4593f..03916baa0 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -807,6 +807,15 @@ void WebContentsDelegateQt::ContentsZoomChange(bool zoom_in) adapter->setZoomFactor(adapter->currentZoomFactor() - 0.1f); } +bool WebContentsDelegateQt::ShouldNavigateOnBackForwardMouseButtons() +{ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + return false; +#else + return true; +#endif +} + FaviconManager *WebContentsDelegateQt::faviconManager() { return m_faviconManager.data(); |