--- /qtbase/src/plugins/platforms/cocoa/qnsview.mm	2013-04-09 00:11:07 +0000
+++ /qtbase/src/plugins/platforms/cocoa/qnsview.mm	2013-07-02 11:34:50 +0000
@@ -676,25 +676,25 @@
     // generates a stream of scroll events. We want the keyboard modifier state to
     // be the state at the beginning of the flick in order to avoid changing the
     // interpretation of the events mid-stream. One example of this happening would
     // be when pressing cmd after scrolling in Qt Creator: not taking the phase into
     // account causes the end of the event stream to be interpreted as font size changes.
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     if ([theEvent respondsToSelector:@selector(scrollingDeltaX)]) {
         NSEventPhase phase = [theEvent phase];
-        if (phase == NSEventPhaseBegan) {
+        if (phase == NSEventPhaseBegan || phase == NSEventPhaseNone) {
             currentWheelModifiers = [self convertKeyModifiers:[theEvent modifierFlags]];
         }
 
         QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, currentWheelModifiers);
 
-        if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled) {
+        if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled || phase == NSEventPhaseNone) {
             currentWheelModifiers = Qt::NoModifier;
         }
     } else
 #endif
     {
         QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta,
                                                  [self convertKeyModifiers:[theEvent modifierFlags]]);
     }
 }