diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 15:02:35 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-23 15:02:35 +0100 |
| commit | 5178f6269418d731efe6bec7bc541f21fdd6d7f4 (patch) | |
| tree | cd09fbc67c6e92652e92951cf9c91385ddce8564 /src/quicktemplates2/qquickspinbox.cpp | |
| parent | 2b0e33692b949ebaed034c72d0ea3da9f0ef6de2 (diff) | |
| parent | 81f656eeac522532ff98a32aac68a1571ea54c99 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
tests/auto/controls/data/tst_popup.qml
Change-Id: I7b7bb5f9c63b32eef65c9b2e68f56baa3da69cff
Diffstat (limited to 'src/quicktemplates2/qquickspinbox.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickspinbox.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp index 75ba52a1..3dc10f34 100644 --- a/src/quicktemplates2/qquickspinbox.cpp +++ b/src/quicktemplates2/qquickspinbox.cpp @@ -955,8 +955,7 @@ void QQuickSpinBox::wheelEvent(QWheelEvent *event) if (d->wheelEnabled) { const QPointF angle = event->angleDelta(); const qreal delta = (qFuzzyIsNull(angle.y()) ? angle.x() : angle.y()) / QWheelEvent::DefaultDeltasPerStep; - if (!d->stepBy(qRound(d->effectiveStepSize() * delta), true)) - event->ignore(); + d->stepBy(qRound(d->effectiveStepSize() * delta), true); } } #endif |