From: Morten Johan Sorvig Date: Wed, 10 Oct 2012 07:02:51 +0000 (+0200) Subject: Cocoa: Send keyboard modifiers with mouse events. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c12b4f26852bc885217ae5ddcd105d88a502328a;p=profile%2Fivi%2Fqtbase.git Cocoa: Send keyboard modifiers with mouse events. Task-number: QTBUG-27462 Change-Id: Icb9352fcae6f92885d4f1381aa8014fef039149b Reviewed-by: Sean Harmer --- diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index a95ff45..fe1b26a 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -315,7 +315,8 @@ static QTouchDevice *touchDevice = 0; QCocoaDrag* nativeDrag = static_cast(QGuiApplicationPrivate::platformIntegration()->drag()); nativeDrag->setLastMouseEvent(theEvent, self); - QWindowSystemInterface::handleMouseEvent(m_window, timestamp, qtWindowPoint, qtScreenPoint, m_buttons); + Qt::KeyboardModifiers keyboardModifiers = [self convertKeyModifiers:[theEvent modifierFlags]]; + QWindowSystemInterface::handleMouseEvent(m_window, timestamp, qtWindowPoint, qtScreenPoint, m_buttons, keyboardModifiers); } - (void)handleFrameStrutMouseEvent:(NSEvent *)theEvent