Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 14:42:40 +0000 (16:42 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 14:42:40 +0000 (16:42 +0200)
commit72c0128f607d1566ede78dfbba90507086e3fe80
tree16672fa24e67319c7c11c6932c680a808bafa357
parent957f36cb498657f94f1b5b92f52713254ff8c051
parent059884feccfda94a16a7939b3394250723ed7c07
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix segfault, if QPixmap::loadFromData() fails