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>
Wed, 24 Nov 2010 09:12:00 +0000 (10:12 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 24 Nov 2010 09:12:00 +0000 (10:12 +0100)
commit03c2fb7e9c39b433232fb6a18881cd8419d8237b
tree5a7238cba47e69affc77f7269dd757709d873ac3
parent3e833cbf5e2d351d548a83f5d0c922760f775a43
parentfb9604741c40790cef72d06afe6ca53165f57b16
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 compliation of ALSA audio backend when checking for surround support.