diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 11:14:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 11:14:19 (GMT) |
| commit | 739cf93e212c27a5880ef4cb50ddf4d238ab236d (patch) | |
| tree | da6db393ef3c8699d1a2dd3346f21990d84d322f /.hgignore | |
| parent | 8cbc34de67d52d5923b3a70bf84aadfe3aa94f24 (diff) | |
| parent | abcea22c5ba45d00c713d25a77773efbf6d941f7 (diff) | |
| download | Qt-739cf93e212c27a5880ef4cb50ddf4d238ab236d.zip Qt-739cf93e212c27a5880ef4cb50ddf4d238ab236d.tar.gz Qt-739cf93e212c27a5880ef4cb50ddf4d238ab236d.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Build fix for -qtnamespace.
Fix compile failure in QtMultimedia.
Verify the audio format before trying to open an audio device.
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions