Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 14 Jan 2011 03:08:43 +0000 (13:08 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 14 Jan 2011 03:08:43 +0000 (13:08 +1000)
commit8062464ce3f5fd6eb92f94d1fafa697385de72ce
tree93b18323a9bc1d1b990e71dc6b27013e07bff68d
parent4f2538b2785e19f391ecdb9694970d3cae3c835f
parent8a86878ddae7584999d22463f8b7583e35ed9ecd
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Proper fix for QGraphicsItem crash.