diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-29 06:18:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-29 06:18:27 (GMT) |
| commit | 68999af7823e80aa049c19f332045b1fb074fb96 (patch) | |
| tree | b18b30c870157e1da14b8cf21568bb0d4684e0cf /src/gui/kernel/qcocoaview_mac.mm | |
| parent | bad50f8a2ef285aa9943291400cd322a6ec7af82 (diff) | |
| parent | 822114e976d7c6644f060ac366c08c92da1a4779 (diff) | |
| download | Qt-68999af7823e80aa049c19f332045b1fb074fb96.zip Qt-68999af7823e80aa049c19f332045b1fb074fb96.tar.gz Qt-68999af7823e80aa049c19f332045b1fb074fb96.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index cf66605..60ac062 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -809,10 +809,10 @@ extern "C" { QWheelEvent qwe(qlocal, qglobal, deltaY, buttons, keyMods, Qt::Vertical); qt_sendSpontaneousEvent(qwidget, &qwe); wheelOK = qwe.isAccepted(); - if (wheelOK && QApplicationPrivate::focus_widget + if (!wheelOK && QApplicationPrivate::focus_widget && QApplicationPrivate::focus_widget != qwidget) { QWheelEvent qwe2(QApplicationPrivate::focus_widget->mapFromGlobal(qglobal), qglobal, - deltaZ, buttons, keyMods, Qt::Vertical); + deltaY, buttons, keyMods, Qt::Vertical); qt_sendSpontaneousEvent(QApplicationPrivate::focus_widget, &qwe2); wheelOK = qwe2.isAccepted(); } |