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:
  QAudioInput loses data on Maemo5/other linux platforms.
  Fix warning in qfilesystemmodel_p.h
  Frequency to SampleRate and channels to channelCount.
  Added setChannelCount() to QAudioFormat.

1 files changed, 2 insertions, 2 deletions

diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 0910865..bf4b145 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -89,9 +89,9 @@ private:
     {
 //![1]
         QAudioFormat format;
-        format.setFrequency(44100);
+        format.setSampleRate(44100);
 //![1]
-        format.setChannels(2);
+        format.setChannelCount(2);
         format.setSampleSize(16);
         format.setCodec("audio/pcm");
         format.setByteOrder(QAudioFormat::LittleEndian);