summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAxel Spoerl <axel.spoerl@qt.io>2023-03-13 09:16:06 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-03-15 14:17:44 +0000
commit3282d501ef493890c8cdc5d8c27dd8cb187a0077 (patch)
treec93947d26bf8ff132aecf267a7fe0d4e7f012300 /tests
parent8755c0561476841357fd074396f9207c29077847 (diff)
emit QAbstractSlider::valueChanged() only on value change
The signal has been emitted also, when the slider position has changed without a value change (e.g. on QWidget::show() or on resizing). This patch stops emitting the signal without a value change. It adds a verification to tst_QAbstractSlider::setValue(), that valueChanged is not emitted on a no-op value change. As a drive-by, the patch removes an unnecessary assignment and changes signal spy constructions to PTMF syntax. Task-number: QTBUG-25365 Change-Id: I9932e45d4e680aa53422ca75aa42a16306213a38 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 8b84374892512faa43e5deeeef22ca558ac5543a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp10
1 files changed, 7 insertions, 3 deletions
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)