diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-06 17:59:42 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-08 10:50:34 +0000 |
| commit | 2d01de4e878f7f6cc6b07027989d09ddf189e285 (patch) | |
| tree | b609b7dd0f03ae22dedc35248724483f278f2f58 /src/plugins | |
| parent | 012af8abf8760981a262064039ca092bc78e9faf (diff) | |
macOS: Add missing m_ prefix to QNSView currentWheelModifiers member
Change-Id: I057db59797f1e18c3a8fc5386f7e1295fe352e02
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_mouse.mm | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index cb6bc4c16a..92254a4952 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -125,7 +125,7 @@ bool m_sendKeyEvent; bool m_dontOverrideCtrlLMB; bool m_sendUpAsRightButton; - Qt::KeyboardModifiers currentWheelModifiers; + Qt::KeyboardModifiers m_currentWheelModifiers; #ifndef QT_NO_OPENGL QCocoaGLContext *m_glContext; bool m_shouldSetGLContextinDrawRect; diff --git a/src/plugins/platforms/cocoa/qnsview_mouse.mm b/src/plugins/platforms/cocoa/qnsview_mouse.mm index 1f04c40f8e..1de256825a 100644 --- a/src/plugins/platforms/cocoa/qnsview_mouse.mm +++ b/src/plugins/platforms/cocoa/qnsview_mouse.mm @@ -574,9 +574,8 @@ // 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. NSEventPhase momentumPhase = [theEvent momentumPhase]; - if (momentumPhase == NSEventPhaseNone) { - currentWheelModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]]; - } + if (momentumPhase == NSEventPhaseNone) + m_currentWheelModifiers = [QNSView convertKeyModifiers:[theEvent modifierFlags]]; NSEventPhase phase = [theEvent phase]; Qt::ScrollPhase ph = Qt::ScrollUpdate; @@ -601,7 +600,7 @@ bool isInverted = [theEvent isDirectionInvertedFromDevice]; qCDebug(lcQpaMouse) << "scroll wheel @ window pos" << qt_windowPoint << "delta px" << pixelDelta << "angle" << angleDelta << "phase" << ph << (isInverted ? "inverted" : ""); - QWindowSystemInterface::handleWheelEvent(m_platformWindow->window(), qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, currentWheelModifiers, ph, source, isInverted); + QWindowSystemInterface::handleWheelEvent(m_platformWindow->window(), qt_timestamp, qt_windowPoint, qt_screenPoint, pixelDelta, angleDelta, m_currentWheelModifiers, ph, source, isInverted); } #endif // QT_CONFIG(wheelevent) |