From 22fd9b9780389f51ab3dd1865d2b5686fa34e6ff Mon Sep 17 00:00:00 2001 From: Carlos Manuel Duclos Vergara Date: Fri, 8 Oct 2010 15:05:14 +0200 Subject: [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 --- src/gui/kernel/qcocoaview_mac.mm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/gui/kernel/qcocoaview_mac.mm') diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index a552ce7f6f..f759fe0cc0 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 -- cgit v1.2.1