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

Conflicts:
	src/quick/items/qquickrectangle.cpp

Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc

13 files changed, 11 insertions, 13 deletions

diff --git a/tests/auto/quick/qquicklistview/data/addTransitions.qml b/tests/auto/quick/qquicklistview/data/addTransitions.qml
index 69e6ba1eea..88db36760f 100644
--- a/tests/auto/quick/qquicklistview/data/addTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/addTransitions.qml
@@ -62,7 +62,7 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
 
diff --git a/tests/auto/quick/qquicklistview/data/displacedTransitions.qml b/tests/auto/quick/qquicklistview/data/displacedTransitions.qml
index d83ccfedf4..37c9e1e588 100644
--- a/tests/auto/quick/qquicklistview/data/displacedTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/displacedTransitions.qml
@@ -69,7 +69,7 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
 
diff --git a/tests/auto/quick/qquicklistview/data/header.qml b/tests/auto/quick/qquicklistview/data/header.qml
index 076bf9cb97..1cc4ae09ee 100644
--- a/tests/auto/quick/qquicklistview/data/header.qml
+++ b/tests/auto/quick/qquicklistview/data/header.qml
@@ -26,7 +26,6 @@ Rectangle {
         focus: true
         width: initialViewWidth
         height: initialViewHeight
-        cacheBuffer: 0
         snapMode: ListView.SnapToItem
         model: testModel
         delegate: myDelegate
diff --git a/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml b/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml
index f1052b1482..4ccf3088b0 100644
--- a/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-enforcerange.qml
@@ -45,7 +45,7 @@ Rectangle {
         objectName: "list"
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
         highlight: myHighlight
diff --git a/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml b/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml
index fa7430c4cb..e094b888ab 100644
--- a/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-noCurrent.qml
@@ -43,7 +43,7 @@ Rectangle {
         currentIndex: -1
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         delegate: myDelegate
         highlightMoveVelocity: 1000
         model: testModel
diff --git a/tests/auto/quick/qquicklistview/data/listview-sections-package.qml b/tests/auto/quick/qquicklistview/data/listview-sections-package.qml
index e0daf50b32..8bad73b5f6 100644
--- a/tests/auto/quick/qquicklistview/data/listview-sections-package.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-sections-package.qml
@@ -68,6 +68,6 @@ Rectangle {
         height: 320
         model: visualModel.parts.package
         section.property: "number"
-        cacheBuffer: 0
+        cacheBuffer: 60
     }
 }
diff --git a/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml b/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml
index d82ff4c63a..7245025bac 100644
--- a/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-sections_delegate.qml
@@ -56,7 +56,7 @@ Rectangle {
         objectName: "list"
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
         section.property: sectionProperty
diff --git a/tests/auto/quick/qquicklistview/data/margins.qml b/tests/auto/quick/qquicklistview/data/margins.qml
index cf6a56c720..3e4defaffb 100644
--- a/tests/auto/quick/qquicklistview/data/margins.qml
+++ b/tests/auto/quick/qquicklistview/data/margins.qml
@@ -42,7 +42,7 @@ Rectangle {
         topMargin: 30
         bottomMargin: 50
         highlightMoveVelocity: 100000
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
     }
diff --git a/tests/auto/quick/qquicklistview/data/moveTransitions.qml b/tests/auto/quick/qquicklistview/data/moveTransitions.qml
index c4dce99208..dbbb4ebe75 100644
--- a/tests/auto/quick/qquicklistview/data/moveTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/moveTransitions.qml
@@ -62,7 +62,7 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
 
diff --git a/tests/auto/quick/qquicklistview/data/multipleDisplaced.qml b/tests/auto/quick/qquicklistview/data/multipleDisplaced.qml
index 5893c30447..e036822980 100644
--- a/tests/auto/quick/qquicklistview/data/multipleDisplaced.qml
+++ b/tests/auto/quick/qquicklistview/data/multipleDisplaced.qml
@@ -44,7 +44,7 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
 
diff --git a/tests/auto/quick/qquicklistview/data/multipleTransitions.qml b/tests/auto/quick/qquicklistview/data/multipleTransitions.qml
index 4fcc80be2d..c0e888c6c6 100644
--- a/tests/auto/quick/qquicklistview/data/multipleTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/multipleTransitions.qml
@@ -53,7 +53,6 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
         model: testModel
         delegate: myDelegate
 
diff --git a/tests/auto/quick/qquicklistview/data/populateTransitions.qml b/tests/auto/quick/qquicklistview/data/populateTransitions.qml
index 84b5b6bc1f..735314524f 100644
--- a/tests/auto/quick/qquicklistview/data/populateTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/populateTransitions.qml
@@ -52,7 +52,7 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate
 
diff --git a/tests/auto/quick/qquicklistview/data/removeTransitions.qml b/tests/auto/quick/qquicklistview/data/removeTransitions.qml
index 861cf42d94..4a34d4b585 100644
--- a/tests/auto/quick/qquicklistview/data/removeTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/removeTransitions.qml
@@ -64,7 +64,7 @@ Rectangle {
         anchors.centerIn: parent
         width: 240
         height: 320
-        cacheBuffer: 0
+        cacheBuffer: 60
         model: testModel
         delegate: myDelegate