From 751989df5cc441dcffbbbe2da0c3c0558701d5c6 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 10 Aug 2013 15:19:27 +0200 Subject: Replace QWheelEvent::Phase with revised Qt::ScrollPhase Change-Id: I4d8e7d48497d0d96a297191976c0d99feb67b538 Reviewed-by: Shawn Rutledge --- src/plugins/platforms/cocoa/qnsview.mm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index aaff86c450..2d3c2f0fad 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -880,20 +880,20 @@ static QTouchDevice *touchDevice = 0; currentWheelModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]]; } - QWheelEvent::Phase ph = QWheelEvent::Changed; + Qt::ScrollPhase ph = Qt::ScrollUpdate; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8 if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) { // On 10.8 and above, MayBegin is likely to happen. We treat it the same as an actual begin. if (phase == NSEventPhaseMayBegin) - ph = QWheelEvent::Started; + ph = Qt::ScrollBegin; } else #endif if (phase == NSEventPhaseBegan) { // On 10.7, MayBegin will not happen, so Began is the actual beginning. - ph = QWheelEvent::Started; + ph = Qt::ScrollBegin; } if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled) { - ph = QWheelEvent::Ended; + ph = Qt::ScrollEnd; } QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, currentWheelModifiers, ph); -- cgit v1.2.3