diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-03 07:25:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-03 07:25:21 (GMT) |
| commit | 46dbe721c8a9efc555eb4c449141071825f2f747 (patch) | |
| tree | 195cf0ca57fa8cda739bcf7133d26b4ec7878e5f /tools/linguist/lupdate | |
| parent | 7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd (diff) | |
| parent | 55cec1c8e73f90f968ce181c3310e5e16f2d5bd8 (diff) | |
| download | Qt-46dbe721c8a9efc555eb4c449141071825f2f747.zip Qt-46dbe721c8a9efc555eb4c449141071825f2f747.tar.gz Qt-46dbe721c8a9efc555eb4c449141071825f2f747.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:
Fixed compile of some tests with `-qtnamespace'
Gstreamer media backend: ensure the null video output is not deleted
Use mute property instead of setting volume to 0 if playbin2 is used.
Gstreamer playback backend: Start loading media on setMedia(),
Fixed compiler warnings when compiling multimedia module.
Diffstat (limited to 'tools/linguist/lupdate')
0 files changed, 0 insertions, 0 deletions