diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-02-03 13:10:50 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-02-03 13:10:50 (GMT) |
| commit | a084456fe8c634f16cf772dce2dd2498e59bed30 (patch) | |
| tree | 41b0fcc16d313e08969e4c21dc997034fde69eec /src/gui/widgets/qabstractslider.cpp | |
| parent | 7e46016d55a80e9d49797efe34779893d80b71e3 (diff) | |
| parent | 09fe8e377fea67b4279521e3cb08bb937ef65474 (diff) | |
| download | Qt-a084456fe8c634f16cf772dce2dd2498e59bed30.zip Qt-a084456fe8c634f16cf772dce2dd2498e59bed30.tar.gz Qt-a084456fe8c634f16cf772dce2dd2498e59bed30.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/widgets/qabstractslider.cpp')
| -rw-r--r-- | src/gui/widgets/qabstractslider.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index 2874647..77c5a01 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -697,6 +697,8 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e) { Q_D(QAbstractSlider); e->ignore(); + if (e->orientation() != d->orientation && !rect().contains(e->pos())) + return; int stepsToScroll = 0; qreal offset = qreal(e->delta()) / 120; |