Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Jun 2010 13:24:34 +0000 (15:24 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 23 Jun 2010 13:24:34 +0000 (15:24 +0200)
commitf6835920b5497f228e2aa3ba397437af30a0bfe9
treebd55bc7c13302c8e91691e65caf95081c92e5151
parent72c8900e421ab4afd65b3752551a7fb857ca540f
parent66da996c11d2f630255650e6e88fc1a08a393b27
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.