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

Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e

1 files changed, 4 insertions, 0 deletions

diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index e140d61dee..f0bbb1e732 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -1984,6 +1984,7 @@ void QQuickPathView::refill()
                     break;
                 }
                 if (d->items.contains(item)) {
+                    d->releaseItem(item);
                     break; //Otherwise we'd "re-add" it, and get confused
                 }
                 if (d->currentIndex == idx) {
@@ -2014,6 +2015,7 @@ void QQuickPathView::refill()
                     break;
                 }
                 if (d->items.contains(item)) {
+                    d->releaseItem(item);
                     break; //Otherwise we'd "re-add" it, and get confused
                 }
                 if (d->currentIndex == idx) {
@@ -2055,6 +2057,8 @@ void QQuickPathView::refill()
                         int lastListIdx = d->items.indexOf(lastItem);
                         d->items.insert(lastListIdx + 1, item);
                         d->updateItem(item, nextPos);
+                    } else {
+                        d->releaseItem(item);
                     }
 
                     lastItem = item;