diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-08 10:02:02 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-08 12:04:06 (GMT) |
| commit | febca287b4b357240246f7149075ee3917f6c20c (patch) | |
| tree | bf812af49462e39c25fd006765f6e64e9c9aefcf /src | |
| parent | 7cc07c14cedcec0b4b2929b6e4243fff80531670 (diff) | |
| download | Qt-febca287b4b357240246f7149075ee3917f6c20c.zip Qt-febca287b4b357240246f7149075ee3917f6c20c.tar.gz Qt-febca287b4b357240246f7149075ee3917f6c20c.tar.bz2 | |
Fixes qabstractslider autotest
Fixed a bad merge in the QAbstractSlider::wheelEvent.
Modified an autotest to follow a change in behavior - scrolling with a
horizontal mouse wheel to the "right" means increasing the value.
Reviewed-by: Richard Moe Gustavsen
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qabstractslider.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp index f0ae5a8..73c17db 100644 --- a/src/gui/widgets/qabstractslider.cpp +++ b/src/gui/widgets/qabstractslider.cpp @@ -739,8 +739,6 @@ void QAbstractSlider::wheelEvent(QWheelEvent * e) { Q_D(QAbstractSlider); e->ignore(); - if (e->orientation() != d->orientation && !rect().contains(e->pos())) - return; int delta = e->delta(); if (d->scrollByDelta(e->orientation(), e->modifiers(), delta)) e->accept(); |