diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 20:24:01 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 20:24:01 (GMT) |
commit | 8f5f164ba1b42d5d0a11b14b00f12f955354c662 (patch) | |
tree | 63a32cdaa45aafe9b9d8f518f9c53baf85c8a7f6 /tests | |
parent | d366c69bbd02a25c61df2e99ed842fa14ec2d643 (diff) | |
parent | 3b768dee3e01c2eb5fb7915a6ea6f1cabb7052aa (diff) | |
download | Qt-8f5f164ba1b42d5d0a11b14b00f12f955354c662.zip Qt-8f5f164ba1b42d5d0a11b14b00f12f955354c662.tar.gz Qt-8f5f164ba1b42d5d0a11b14b00f12f955354c662.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioOutput(ALSA); Fix check for available devices.
Phonon; Update CMakeLists.txt
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions