summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorbjørn Lund Martsum <tmartsum@gmail.com>2012-02-23 15:53:51 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 23:16:25 +0100
commit87975f88ce72b803fe3fa982540b940c2e205009 (patch)
treef34ddab8b7821cbb3c0761bfb7464084382881cb
parentdb1abf9f760ebc40b1f7f0f3e88698cea8aebbd7 (diff)
QAbstractSlider - adding setRange as a slot
In many situations it would be very nice to have setRange as a slot. It fits good with the rangeChanged signal - and in some situations it does make sense to synchronize scrollbars ranges. Change-Id: I6bcb41ed6e009e5822b56b621e4e187fe52502a6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
-rw-r--r--src/widgets/widgets/qabstractslider.h3
-rw-r--r--tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp13
2 files changed, 14 insertions, 2 deletions
diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h
index dbcd14cb67..d03a1a3918 100644
--- a/src/widgets/widgets/qabstractslider.h
+++ b/src/widgets/widgets/qabstractslider.h
@@ -79,8 +79,6 @@ public:
void setMaximum(int);
int maximum() const;
- void setRange(int min, int max);
-
void setSingleStep(int);
int singleStep() const;
@@ -120,6 +118,7 @@ public:
public Q_SLOTS:
void setValue(int);
void setOrientation(Qt::Orientation);
+ void setRange(int min, int max);
Q_SIGNALS:
void valueChanged(int value);
diff --git a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index 6021f90ed4..cff847474c 100644
--- a/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
@@ -93,6 +93,7 @@ private slots:
void setValue_data();
void setValue();
void setRepeatAction();
+ void connectedSliders();
private:
void waitUntilTimeElapsed(const QTime& t, int ms);
@@ -1259,5 +1260,17 @@ void tst_QAbstractSlider::setRepeatAction()
QCOMPARE(slider->value(), 115);
}
+void tst_QAbstractSlider::connectedSliders()
+{
+ Slider *slider2 = new Slider(topLevel);
+ connect(slider, SIGNAL(rangeChanged(int, int)), slider2, SLOT(setRange(int, int)));
+ const int sliderlow = 13;
+ const int sliderhigh = 1017;
+ slider->setRange(sliderlow, sliderhigh);
+ QCOMPARE(slider2->minimum(), sliderlow);
+ QCOMPARE(slider2->maximum(), sliderhigh);
+ delete slider2;
+}
+
QTEST_MAIN(tst_QAbstractSlider)
#include "tst_qabstractslider.moc"