Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 14 Jan 2010 07:00:03 +0000 (08:00 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 14 Jan 2010 07:00:03 +0000 (08:00 +0100)
commitf17aeadf56818e5f20e20eb91450e66adb88c99b
treea20785cafd67c7624f967a6eea3eabb3f4f5400c
parent862d5433fb694a03715b2327a107b3192b921924
parentecd0b1744442cba83d9bcad899f7b09cb99f2d92
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team:
  Revert "Frequency to SampleRate and channels to channelCount." missed
  Revert "Frequency to SampleRate and channels to channelCount."
  Revert "Added setChannelCount() to QAudioFormat."