Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Apr 2010 05:27:28 +0000 (07:27 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Apr 2010 05:27:28 +0000 (07:27 +0200)
commit64a360f45ab9a1c50ca628cfd6b670b93816c756
tree3c362ab47af7b19be6351315b8e34e538b23c319
parent7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb
parent544bbfadc0703597b7084213261053ca0e2facf6
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Corruption in data captured by QAudioInput
  Just one (static) waveInCriticalSection but multiple QAudioInput to
  Mismatch between reported and actual supported sample rates in