diff options
| author | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-10-08 13:05:14 (GMT) |
|---|---|---|
| committer | Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com> | 2010-10-11 10:29:22 (GMT) |
| commit | 22fd9b9780389f51ab3dd1865d2b5686fa34e6ff (patch) | |
| tree | 464d31e143e2df2542013409f23e60f3c7025e44 /src/gui | |
| parent | 30e81cbdae4b8a5eae1be5224880b408c0f4a0ff (diff) | |
| download | Qt-22fd9b9780389f51ab3dd1865d2b5686fa34e6ff.zip Qt-22fd9b9780389f51ab3dd1865d2b5686fa34e6ff.tar.gz Qt-22fd9b9780389f51ab3dd1865d2b5686fa34e6ff.tar.bz2 | |
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
The problem is the fact that we were propagating the event through the
class hierarchy. This means calling the super class implementation,
which does nothing but pass the event to the next guy, which is the
other window, which in turn does the same thing...
The point is, there is no need to propagate this event on the class
hierarchy. If anything, this should be propagated on the widgets
hierarchy, which is already handled by Qt. Removing the code so this
problem does not happen again.
Task-number: QTBUG-12952
Reviewed-by: Richard Moe Gustavsen
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index a552ce7..f759fe0 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -939,10 +939,6 @@ static int qCocoaViewCount = 0; } } #endif //QT_NO_WHEELEVENT - - if (!wheelOK) { - return [super scrollWheel:theEvent]; - } } - (void)tabletProximity:(NSEvent *)tabletEvent |