1 files changed, 22 insertions, 22 deletions

diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index 10262e8cc0..1f5cda9d18 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -230,7 +230,7 @@ public:
         : flow(QQuickGridView::FlowLeftToRight)
         , cellWidth(100), cellHeight(100), columns(1)
         , snapMode(QQuickGridView::NoSnap)
-        , highlightXAnimator(0), highlightYAnimator(0)
+        , highlightXAnimator(nullptr), highlightYAnimator(nullptr)
     {}
     ~QQuickGridViewPrivate()
     {
@@ -390,7 +390,7 @@ FxViewItem *QQuickGridViewPrivate::snapItemAt(qreal pos) const
         if (itemTop+rowSize()/2 >= pos && itemTop - rowSize()/2 <= pos)
             return item;
     }
-    return 0;
+    return nullptr;
 }
 
 int QQuickGridViewPrivate::snapIndex() const
@@ -508,12 +508,14 @@ bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal
     }
 
     int colNum = qFloor((colPos+colSize()/2) / colSize());
-    FxGridItemSG *item = 0;
+    FxGridItemSG *item = nullptr;
     bool changed = false;
 
+    QQmlIncubator::IncubationMode incubationMode = doBuffer ? QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested;
+
     while (modelIndex < model->count() && rowPos <= fillTo + rowSize()*(columns - colNum)/(columns+1)) {
         qCDebug(lcItemViewDelegateLifecycle) << "refill: append item" << modelIndex << colPos << rowPos;
-        if (!(item = static_cast<FxGridItemSG*>(createItem(modelIndex, doBuffer))))
+        if (!(item = static_cast<FxGridItemSG*>(createItem(modelIndex, incubationMode))))
             break;
         if (!transitioner || !transitioner->canTransition(QQuickItemViewTransitioner::PopulateTransition, true)) // pos will be set by layoutVisibleItems()
             item->setPosition(colPos, rowPos, true);
@@ -535,20 +537,19 @@ bool QQuickGridViewPrivate::addVisibleItems(qreal fillFrom, qreal fillTo, qreal
     if (visibleItems.count()) {
         FxGridItemSG *firstItem = static_cast<FxGridItemSG*>(visibleItems.constFirst());
         rowPos = firstItem->rowPos();
-        colNum = qFloor((firstItem->colPos()+colSize()/2) / colSize());
-        if (--colNum < 0) {
-            colNum = columns - 1;
-            rowPos -= rowSize();
-        }
-    } else {
-        colNum = qFloor((colPos+colSize()/2) / colSize());
+        colPos = firstItem->colPos();
+    }
+    colNum = qFloor((colPos+colSize()/2) / colSize());
+    if (--colNum < 0) {
+        colNum = columns - 1;
+        rowPos -= rowSize();
     }
 
     // Prepend
     colPos = colNum * colSize();
     while (visibleIndex > 0 && rowPos + rowSize() - 1 >= fillFrom - rowSize()*(colNum+1)/(columns+1)){
         qCDebug(lcItemViewDelegateLifecycle) << "refill: prepend item" << visibleIndex-1 << "top pos" << rowPos << colPos;
-        if (!(item = static_cast<FxGridItemSG*>(createItem(visibleIndex-1, doBuffer))))
+        if (!(item = static_cast<FxGridItemSG*>(createItem(visibleIndex-1, incubationMode))))
             break;
         --visibleIndex;
         if (!transitioner || !transitioner->canTransition(QQuickItemViewTransitioner::PopulateTransition, true)) // pos will be set by layoutVisibleItems()
@@ -579,7 +580,7 @@ void QQuickGridViewPrivate::removeItem(FxViewItem *item)
 
 bool QQuickGridViewPrivate::removeNonVisibleItems(qreal bufferFrom, qreal bufferTo)
 {
-    FxGridItemSG *item = 0;
+    FxGridItemSG *item = nullptr;
     bool changed = false;
 
     while (visibleItems.count() > 1
@@ -699,14 +700,14 @@ void QQuickGridViewPrivate::createHighlight()
     bool changed = false;
     if (highlight) {
         if (trackedItem == highlight)
-            trackedItem = 0;
+            trackedItem = nullptr;
         delete highlight;
-        highlight = 0;
+        highlight = nullptr;
 
         delete highlightXAnimator;
         delete highlightYAnimator;
-        highlightXAnimator = 0;
-        highlightYAnimator = 0;
+        highlightXAnimator = nullptr;
+        highlightYAnimator = nullptr;
 
         changed = true;
     }
@@ -892,7 +893,6 @@ void QQuickGridViewPrivate::initializeCurrentItem()
 
 void QQuickGridViewPrivate::fixupPosition()
 {
-    moveReason = Other;
     if (flow == QQuickGridView::FlowLeftToRight)
         fixupY();
     else
@@ -2410,11 +2410,11 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
         } else {
             while (i >= 0) {
                 // item is before first visible e.g. in cache buffer
-                FxViewItem *item = 0;
+                FxViewItem *item = nullptr;
                 if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                     item->index = modelIndex + i;
                 if (!item)
-                    item = createItem(modelIndex + i);
+                    item = createItem(modelIndex + i, QQmlIncubator::Synchronous);
                 if (!item)
                     return false;
 
@@ -2462,12 +2462,12 @@ bool QQuickGridViewPrivate::applyInsertionChange(const QQmlChangeSet::Change &ch
         int i = 0;
         int to = buffer+displayMarginEnd+tempPos+size()-1;
         while (i < count && rowPos <= to + rowSize()*(columns - colNum)/qreal(columns+1)) {
-            FxViewItem *item = 0;
+            FxViewItem *item = nullptr;
             if (change.isMove() && (item = currentChanges.removedItems.take(change.moveKey(modelIndex + i))))
                 item->index = modelIndex + i;
             bool newItem = !item;
             if (!item)
-                item = createItem(modelIndex + i);
+                item = createItem(modelIndex + i, QQmlIncubator::Synchronous);
             if (!item)
                 return false;