Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 26 Apr 2011 07:35:03 +0000 (17:35 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 26 Apr 2011 07:35:03 +0000 (17:35 +1000)
commitd0787ad401a8e214b10ee3a78f150ed94d94182c
tree91d8bbde849498ed8e4eba81763836c320976ea9
parent87c03292dce257f1f72d3fdc4e9457f1e1269ce2
parent4226a34e4e2f8739b238b9f9b1769e2fd4fabd7e
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Set QPixmapCache default limit to 10MB on Symbian.
src/declarative/util/qdeclarativepixmapcache.cpp