diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2021-10-21 10:19:12 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2021-10-25 05:48:56 +0000 |
| commit | 474ce0399ddcd82651cae8ae60eb5e3e56c37503 (patch) | |
| tree | 45de05346864368b476d68ff24f8e2702a637178 /src/plugins/help | |
| parent | 404cf0f63229c6b46a77220769aebab10b1b383a (diff) | |
Ignore the wheel event explicitly in order to propagate it further
Qt 6 brings a behavioral change regarding delivery of wheel events:
92df790f46b3a8b17aec2f385d6472fd3f8647f6 and
2a857ee28315c5bacfe2ecaf402ca9005b35c20e. If there is an event
filter installed and wheel event is being processed, the event
is now accepted by default, which means that after returning
true from eventFilter(), the event is not propagated anymore.
Since we want to redirect the event to the parent HelpViewer object,
we explicitly ignore the event prior to returning true.
This patch fixes the QTextBrowser backend.
Amends 0b96a1b76b869d8227e10ec1dd6aa9c21ba5ff13
Fixes: QTCREATORBUG-26369
Change-Id: I7a0167c54f830fffab13d73eb91cb2ecbd730c86
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/textbrowserhelpviewer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/help/textbrowserhelpviewer.cpp b/src/plugins/help/textbrowserhelpviewer.cpp index fd6c36c4d4..6447190ca9 100644 --- a/src/plugins/help/textbrowserhelpviewer.cpp +++ b/src/plugins/help/textbrowserhelpviewer.cpp @@ -372,6 +372,7 @@ void TextBrowserHelpWidget::wheelEvent(QWheelEvent *e) // view in a broken way. We handle it properly through the sequence: // HelpViewer::wheelEvent() -> LocalHelpManager::setFontZoom() -> // HelpViewer::setFontZoom() -> TextBrowserHelpViewer::setFontAndScale(). + e->ignore(); return; } } |