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

Conflicts:
	.qmake.conf
	src/qml/qml/qqmlengine.cpp
	src/quick/items/qquickitemsmodule.cpp
	tools/qml/main.cpp

Change-Id: Ida8daf6b4d7e675385f2f5514c446e52dedaf136

4 files changed, 97 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml b/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml
index 7245025bac..11da286f4d 100644
--- a/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml
@@ -12,6 +12,9 @@ Rectangle {
             Item {
                 id: wrapper
                 objectName: "wrapper"
+                property string section: ListView.section
+                property string nextSection: ListView.nextSection
+                property string prevSection: ListView.previousSection
                 height: 20;
                 width: 240
                 Rectangle {
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index b25fc5402b..6377650696 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -133,6 +133,7 @@ private slots:
     void sectionsDelegate_headerVisibility();
     void sectionPropertyChange();
     void sectionDelegateChange();
+    void sectionsItemInsertion();
     void cacheBuffer();
     void positionViewAtBeginningEnd();
     void positionViewAtIndex();
@@ -2544,6 +2545,67 @@ void tst_QQuickListView::sectionDelegateChange()
     delete window;
 }
 
+// QTBUG-43873
+void tst_QQuickListView::sectionsItemInsertion()
+{
+    QQuickView *window = createView();
+
+    QaimModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), QString::number(i/5));
+
+    QQmlContext *ctxt = window->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    window->setSource(testFileUrl("listview-sections_delegate.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
+    QTRY_VERIFY(listview != 0);
+    QQuickItem *contentItem = listview->contentItem();
+    QTRY_VERIFY(contentItem != 0);
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+
+    for (int i = 0; i < 3; ++i) {
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "sect_" + QString::number(i));
+        QVERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(i*20*6));
+    }
+
+    QQuickItem *topItem = findVisibleChild(contentItem, "sect_0"); // section header
+    QVERIFY(topItem);
+    QCOMPARE(topItem->y(), 0.);
+
+    // Insert a full screen of items at the beginning.
+    for (int i = 0; i < 10; i++)
+        model.insertItem(i, "Item" + QString::number(i), QLatin1String("A"));
+
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+
+    int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
+    QVERIFY(itemCount > 10);
+
+    // Verify that the new items are postioned correctly, and have the correct attached section properties
+    for (int i = 0; i < 10 && i < itemCount; ++i) {
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
+        QVERIFY(item);
+        QTRY_COMPARE(item->y(), 20+i*20.0);
+        QCOMPARE(item->property("section").toString(), QLatin1String("A"));
+        QCOMPARE(item->property("nextSection").toString(), i < 9 ? QLatin1String("A") : QLatin1String("0"));
+        QCOMPARE(item->property("prevSection").toString(), i > 0 ? QLatin1String("A") : QLatin1String(""));
+    }
+    // Verify that the exiting items are postioned correctly, and have the correct attached section properties
+    for (int i = 10; i < 15 && i < itemCount; ++i) {
+        QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
+        QVERIFY(item);
+        QTRY_COMPARE(item->y(), 40+i*20.0);
+        QCOMPARE(item->property("section").toString(), QLatin1String("0"));
+        QCOMPARE(item->property("nextSection").toString(), i < 14 ? QLatin1String("0") : QLatin1String("1"));
+        QCOMPARE(item->property("prevSection").toString(), i > 10 ? QLatin1String("0") : QLatin1String("A"));
+    }
+}
+
 void tst_QQuickListView::currentIndex_delayedItemCreation()
 {
     QFETCH(bool, setCurrentToZero);
diff --git a/tests/auto/quick/qquickrectangle/data/gradient-border.qml b/tests/auto/quick/qquickrectangle/data/gradient-border.qml
new file mode 100644
index 0000000000..1d45fb2799
--- /dev/null
+++ b/tests/auto/quick/qquickrectangle/data/gradient-border.qml
@@ -0,0 +1,21 @@
+import QtQuick 2.0
+
+Item {
+    Rectangle {
+        width: 100
+        height: 100
+        border.width: 10
+        radius: 10
+
+        gradient: Gradient {
+            GradientStop {
+                position: 0.00
+                color: '#ffffff'
+            }
+            GradientStop {
+                position: 0.94
+                color: '#000000'
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
index 8a24636647..a7e82e272f 100644
--- a/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
+++ b/tests/auto/quick/qquickrectangle/tst_qquickrectangle.cpp
@@ -35,6 +35,7 @@
 
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
+#include <QtQuick/qquickview.h>
 #include <private/qquickrectangle_p.h>
 
 #include "../../shared/util.h"
@@ -47,6 +48,7 @@ public:
 
 private slots:
     void gradient();
+    void gradient_border();
     void antialiasing();
 
 private:
@@ -88,6 +90,15 @@ void tst_qquickrectangle::gradient()
     delete rect;
 }
 
+void tst_qquickrectangle::gradient_border()
+{
+    QQuickView view;
+    view.setSource(testFileUrl("gradient-border.qml"));
+    view.show();
+
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+}
+
 void tst_qquickrectangle::antialiasing()
 {
     QQmlComponent component(&engine);