Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 23 May 2011 11:51:45 +0000 (13:51 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Mon, 23 May 2011 11:51:45 +0000 (13:51 +0200)
commitf0819b0c3f80fb4f6abad8f00ef94cf52dd6c123
treecaada59a27fe48c7cc40a729e50d77c811062afc
parenta12c55f1b3b2ec76c2e8d1c080897c55e0528b11
parente430f1336881850a73a54a291e0276160d568212
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
src/declarative/util/qdeclarativepixmapcache.cpp