diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
| commit | d588ec795bf905d6d4a4827ad74f3d01315e40bf (patch) | |
| tree | 67227f80379d77962602b758093251b593ee0c08 /tests/auto/quick/qquicklistview/data/removeTransitions.qml | |
| parent | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (diff) | |
| parent | fdc18a5f25ba1c4cf35e1fa6f21272167bde36a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickrectangle.cpp
Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
Diffstat (limited to 'tests/auto/quick/qquicklistview/data/removeTransitions.qml')
| -rw-r--r-- | tests/auto/quick/qquicklistview/data/removeTransitions.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |