diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 02:29:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 02:29:05 (GMT) |
| commit | 118e7a807d0764dee97612589fe5d7072d271e1e (patch) | |
| tree | e2d7e366acb46082c119c165e11a235c6eced9b5 /tests/auto/qsslerror | |
| parent | 2dde31f712b5952838d867966d99565e1c7c825d (diff) | |
| parent | 3f3e86d6fce5bb781bc41def35d0f15c58ef769c (diff) | |
| download | Qt-118e7a807d0764dee97612589fe5d7072d271e1e.zip Qt-118e7a807d0764dee97612589fe5d7072d271e1e.tar.gz Qt-118e7a807d0764dee97612589fe5d7072d271e1e.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:
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.
Diffstat (limited to 'tests/auto/qsslerror')
0 files changed, 0 insertions, 0 deletions