diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-09 11:33:52 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-10 14:41:58 (GMT) |
| commit | 5ab191af20bf2b1fed2b8886ac247c2953087c14 (patch) | |
| tree | b6ef3fa71ef65d7016ebd2cc2a11659f39f57c9d /src/gui/kernel/qcocoaview_mac.mm | |
| parent | e950fad2ab8b0c93da176ce2f07a4d45a3185cb4 (diff) | |
| download | Qt-5ab191af20bf2b1fed2b8886ac247c2953087c14.zip Qt-5ab191af20bf2b1fed2b8886ac247c2953087c14.tar.gz Qt-5ab191af20bf2b1fed2b8886ac247c2953087c14.tar.bz2 | |
Fixed compilation with QT_NO_WHEELEVENT
Reviewed-by: Prasanth
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index 756cf92..ad64a91 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -828,6 +828,7 @@ extern "C" { deltaZ = qBound(-120, int([theEvent deltaZ] * 10000), 120); } +#ifndef QT_NO_WHEELEVENT if (deltaX != 0) { QWheelEvent qwe(qlocal, qglobal, deltaX, buttons, keyMods, Qt::Horizontal); qt_sendSpontaneousEvent(widgetToGetMouse, &qwe); @@ -868,6 +869,8 @@ extern "C" { wheelOK = qwe2.isAccepted(); } } +#endif //QT_NO_WHEELEVENT + if (!wheelOK) { return [super scrollWheel:theEvent]; } |