diff options
| author | axis <qt-info@nokia.com> | 2011-02-24 16:07:22 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-02-24 16:07:22 (GMT) |
| commit | 2b768ad7d4de4862584762a7d106d9cfcc3416df (patch) | |
| tree | 0ddfe84f345d7e61ce71daa51fbbfb373c3e3106 /demos/declarative/flickr | |
| parent | bb7d9bcc8e0c617091e91f7a40f3d33f8c1cdec1 (diff) | |
| parent | ca7be48b7a150952a9657d1000941fb986e5bb2b (diff) | |
| download | Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.zip Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.gz Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'demos/declarative/flickr')
| -rw-r--r-- | demos/declarative/flickr/flickr.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 11470a8..e0af466 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -62,7 +62,7 @@ Item { GridView { id: photoGridView; model: rssModel; delegate: Mobile.GridDelegate {} - cacheBuffer: 100 + cacheBuffer: 1000 cellWidth: (parent.width-2)/4; cellHeight: cellWidth; width: parent.width; height: parent.height } |