diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 07:00:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-14 07:00:03 (GMT) |
| commit | f17aeadf56818e5f20e20eb91450e66adb88c99b (patch) | |
| tree | a20785cafd67c7624f967a6eea3eabb3f4f5400c /tests/auto/qs60mainapplication | |
| parent | 862d5433fb694a03715b2327a107b3192b921924 (diff) | |
| parent | ecd0b1744442cba83d9bcad899f7b09cb99f2d92 (diff) | |
| download | Qt-f17aeadf56818e5f20e20eb91450e66adb88c99b.zip Qt-f17aeadf56818e5f20e20eb91450e66adb88c99b.tar.gz Qt-f17aeadf56818e5f20e20eb91450e66adb88c99b.tar.bz2 | |
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."
Diffstat (limited to 'tests/auto/qs60mainapplication')
0 files changed, 0 insertions, 0 deletions