diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 06:17:19 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-23 06:17:19 (GMT) |
commit | 7468727b7bf5728502c2928c71185a67bbd6de0b (patch) | |
tree | 273fa920524b36fbc5f3a35c971399f357a04b91 /src/3rdparty/ptmalloc | |
parent | 2836c2806e3bdfb6d29d99f74f1b15950fa39e35 (diff) | |
parent | 51de46840d32f714faa4717ae54a1e8559a43eab (diff) | |
download | Qt-7468727b7bf5728502c2928c71185a67bbd6de0b.zip Qt-7468727b7bf5728502c2928c71185a67bbd6de0b.tar.gz Qt-7468727b7bf5728502c2928c71185a67bbd6de0b.tar.bz2 |
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:
Fix compile failure in QtMultimedia.
Verify the audio format before trying to open an audio device.
Diffstat (limited to 'src/3rdparty/ptmalloc')
0 files changed, 0 insertions, 0 deletions