Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/qml/jsruntime/qv4functionobject.cpp
	src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h

Change-Id: Id164f6c3b45501aa466908659ec4e3b957323753

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
index 1fed2ecda8..2ecb3c4725 100644
--- a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
+++ b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
@@ -81,6 +81,13 @@ void tst_qquickrectangle::gradient()
     QCOMPARE(stops.at(&stops, 1)->position(), 1.0);
     QCOMPARE(stops.at(&stops, 1)->color(), QColor("white"));
 
+    QGradientStops gradientStops = grad->gradientStops();
+    QCOMPARE(gradientStops.count(), 2);
+    QCOMPARE(gradientStops.at(0).first, 0.0);
+    QCOMPARE(gradientStops.at(0).second, QColor("gray"));
+    QCOMPARE(gradientStops.at(1).first, 1.0);
+    QCOMPARE(gradientStops.at(1).second, QColor("white"));
+
     QMetaObject::invokeMethod(rect, "resetGradient");
 
     grad = rect->gradient();