Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 4 Jun 2011 01:58:14 +0000 (11:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 4 Jun 2011 01:58:14 +0000 (11:58 +1000)
commitb296c72042fc9d8841c62f1b2028946b077a3b3a
tree0dab9eae4b288c1e3ea929141b1f0381afe87ca7
parentd031b1aba3110776de4b70f8ffcb828f60b8b654
parentde48af046a093834b8178238a2afb2efc8636efd
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Revert some of "Make QMLViewer startup animation stop after a while"
  Add private method for flushing the pixmap cache.
src/declarative/graphicsitems/qdeclarativemousearea.cpp
src/declarative/graphicsitems/qdeclarativemousearea_p.h
src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
src/declarative/util/qdeclarativepixmapcache.cpp
src/declarative/util/qdeclarativepixmapcache_p.h