summaryrefslogtreecommitdiffstats
path: root/tools/linguist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-03 07:25:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-03 07:25:21 (GMT)
commit46dbe721c8a9efc555eb4c449141071825f2f747 (patch)
tree195cf0ca57fa8cda739bcf7133d26b4ec7878e5f /tools/linguist
parent7d0f65a26e0c5d96d86b8404c287fb736f5ffdcd (diff)
parent55cec1c8e73f90f968ce181c3310e5e16f2d5bd8 (diff)
downloadQt-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')
0 files changed, 0 insertions, 0 deletions