diff options
| author | Liang Qi <liang.qi@digia.com> | 2012-11-26 14:29:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-27 07:46:01 +0100 |
| commit | 99ff142fcf320664fe63f85d9f6b861e58392c56 (patch) | |
| tree | 64409041a712c9a948f56e3260350fbd36d800d1 /src/plugins | |
| parent | f149b8879a6c773de73756ac41d11614aef4f643 (diff) | |
Mac: Fix wheel event handling on 10.6
Change "else" case to support compiling on 10.7+
and deploying on 10.6
Task-number: QTBUG-28060
Change-Id: Iaaeaaefe98083863ed750c7cb320db02e16543af
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 8e18ca3708..68117824db 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -665,12 +665,12 @@ static QTouchDevice *touchDevice = 0; if (phase == NSEventPhaseEnded || phase == NSEventPhaseCancelled) { currentWheelModifiers = Qt::NoModifier; } - } -#else - QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_windowPoint, pixelDelta, angleDelta, - [self convertKeyModifiers:[theEvent modifierFlags]]); + } else #endif - + { + QWindowSystemInterface::handleWheelEvent(m_window, qt_timestamp, qt_windowPoint, qt_windowPoint, pixelDelta, angleDelta, + [self convertKeyModifiers:[theEvent modifierFlags]]); + } } #endif //QT_NO_WHEELEVENT |