projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2836c28 51de468)
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, 23 Sep 2010 06:17:19 +0000 (08:17 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 23 Sep 2010 06:17:19 +0000 (08:17 +0200)
commit7468727b7bf5728502c2928c71185a67bbd6de0b
tree273fa920524b36fbc5f3a35c971399f357a04b91tree | snapshot
parent2836c2806e3bdfb6d29d99f74f1b15950fa39e35commit | diff
parent51de46840d32f714faa4717ae54a1e8559a43eabcommit | diff
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.
6b46b7419a5aee9bd5fce67b7bfa8afe8e