diff options
| -rw-r--r-- | src/widgets/widgets/qabstractslider.cpp | 11 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp | 10 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/widgets/widgets/qabstractslider.cpp b/src/widgets/widgets/qabstractslider.cpp index aa2038b2b6..e60cbbe038 100644 --- a/src/widgets/widgets/qabstractslider.cpp +++ b/src/widgets/widgets/qabstractslider.cpp @@ -534,18 +534,25 @@ void QAbstractSlider::setValue(int value) value = d->bound(value); if (d->value == value && d->position == value) return; + + // delay signal emission until sliderChanged() has been called + const bool emitValueChanged = (value != d->value); d->value = value; + if (d->position != value) { d->position = value; if (d->pressed) - emit sliderMoved((d->position = value)); + emit sliderMoved(d->position); } #ifndef QT_NO_ACCESSIBILITY QAccessibleValueChangeEvent event(this, d->value); QAccessible::updateAccessibility(&event); #endif sliderChange(SliderValueChange); - emit valueChanged(value); + + if (emitValueChanged) + emit valueChanged(value); + } /*! diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp index 7ab609a7ca..d395508ec9 100644 --- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp +++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp @@ -2046,9 +2046,9 @@ void tst_QAbstractSlider::setValue() slider->setRange(minimum, maximum); slider->setSliderDown(down); slider->setValue(49); // to force a valueChanged() below - QSignalSpy spy1(slider, SIGNAL(sliderMoved(int))); - QSignalSpy spy2(slider, SIGNAL(valueChanged(int))); - QSignalSpy spy3(slider, SIGNAL(actionTriggered(int))); + QSignalSpy spy1(slider, &QAbstractSlider::sliderMoved); + QSignalSpy spy2(slider, &QAbstractSlider::valueChanged); + QSignalSpy spy3(slider, &QAbstractSlider::actionTriggered); slider->setValue(50); QCOMPARE(spy1.count(), down ? 1 : 0); QCOMPARE(spy2.count(), 1); @@ -2057,6 +2057,10 @@ void tst_QAbstractSlider::setValue() QCOMPARE(slider->sliderPosition(), reportedSliderPosition); if (down) QVERIFY(sliderMovedTimeStamp < valueChangedTimeStamp); + + slider->setValue(50); + QApplication::processEvents(); + QCOMPARE(spy2.size(), 1); } void tst_QAbstractSlider::waitUntilTimeElapsed(const QElapsedTimer &t, int ms) |