Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

1 files changed, 13 insertions, 0 deletions

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"