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

Conflicts:
	src/quick/items/context2d/qquickcanvasitem.cpp
	src/quickwidgets/qquickwidget.cpp
	tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp

Change-Id: Idf279cb88e0df2a383489af5b6afdf04d04ae611

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index f5e79614df..b83edec996 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -629,6 +629,8 @@ void tst_QQuickListView::inserted_more(QQuickItemView::VerticalLayoutDirection v
     }
     listview->setContentY(contentY);
 
+    QQuickItemViewPrivate::get(listview)->layout();
+
     QList<QPair<QString, QString> > newData;
     for (int i=0; i<insertCount; i++)
         newData << qMakePair(QString("value %1").arg(i), QString::number(i));
@@ -650,6 +652,16 @@ void tst_QQuickListView::inserted_more(QQuickItemView::VerticalLayoutDirection v
         QCOMPARE(item0->y(), itemsOffsetAfterMove);
 #endif
 
+    QList<FxViewItem *> visibleItems = QQuickItemViewPrivate::get(listview)->visibleItems;
+    for (QList<FxViewItem *>::const_iterator itemIt = visibleItems.begin(); itemIt != visibleItems.end(); ++itemIt)
+    {
+        FxViewItem *item = *itemIt;
+        if (item->item->position().y() >= 0 && item->item->position().y() < listview->height())
+        {
+            QVERIFY(!QQuickItemPrivate::get(item->item)->culled);
+        }
+    }
+
     QList<QQuickItem*> items = findItems<QQuickItem>(contentItem, "wrapper");
     int firstVisibleIndex = -1;
     for (int i=0; i<items.count(); i++) {
@@ -770,6 +782,11 @@ void tst_QQuickListView::inserted_more_data()
             << 80.0     // show 4-19
             << 20 << 3
             << 0.0;
+
+    QTest::newRow("add multiple, within visible, content at start")
+            << 0.0
+            << 2 << 50
+            << 0.0;
 }
 
 void tst_QQuickListView::insertBeforeVisible()