summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-11 10:35:32 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-11 10:38:20 (GMT)
commit9b2038e41a9aa16df0595b812df0d414a8246f52 (patch)
tree5f6bef64ebadeab1b170c6adb602c24de28ce10e
parentc6010d73cb5876dd7c87883e4dcca9963a1eb3c8 (diff)
downloadQt-9b2038e41a9aa16df0595b812df0d414a8246f52.zip
Qt-9b2038e41a9aa16df0595b812df0d414a8246f52.tar.gz
Qt-9b2038e41a9aa16df0595b812df0d414a8246f52.tar.bz2
Fix slider stepping when used with keypad navigation
QElapsedTimer usage was corrected Task-number: QTBUG-9857 Reviewed-by: Alessandro Portale
-rw-r--r--src/gui/widgets/qabstractslider.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/widgets/qabstractslider.cpp b/src/gui/widgets/qabstractslider.cpp
index 6a01d68..f38bae7 100644
--- a/src/gui/widgets/qabstractslider.cpp
+++ b/src/gui/widgets/qabstractslider.cpp
@@ -219,8 +219,12 @@ QAbstractSliderPrivate::QAbstractSliderPrivate()
#ifdef QT_KEYPAD_NAVIGATION
, isAutoRepeating(false)
, repeatMultiplier(1)
-#endif
{
+ firstRepeat.invalidate();
+#else
+{
+#endif
+
}
QAbstractSliderPrivate::~QAbstractSliderPrivate()
@@ -787,7 +791,7 @@ void QAbstractSlider::keyPressEvent(QKeyEvent *ev)
}
}
- else if (!d->firstRepeat.isValid()) {
+ else if (d->firstRepeat.isValid()) {
d->firstRepeat.invalidate();
d->repeatMultiplier = 1;
}