summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/cocoa
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-10 15:19:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-15 10:02:36 +0200
commit751989df5cc441dcffbbbe2da0c3c0558701d5c6 (patch)
treefaaed4ab993c54924da0be15ec7c090c0041ab18 /src/plugins/platforms/cocoa
parent8e13a9792afcaf1be901ac00418b30372e818fde (diff)
Replace QWheelEvent::Phase with revised Qt::ScrollPhase
Change-Id: I4d8e7d48497d0d96a297191976c0d99feb67b538 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r--src/plugins/platforms/cocoa/qnsview.mm8
1 files changed, 4 insertions, 4 deletions
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);