Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 Aug 2010 07:25:01 +0000 (09:25 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 12 Aug 2010 07:25:01 +0000 (09:25 +0200)
commitb0d2a439314bc86e6e15fe033c1edaee471b4b95
tree922ff01fb97543a54c028a66e00379e45f3b080e
parent8dca92fd7987a9aa727dea6c367c079a39668f09
parentda0303d1ba6acc58f60c7448fefeffc88e8e331b
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:
  QAudioOutput(ALSA); Fix check for available devices.