diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 09:28:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-19 09:28:31 (GMT) |
| commit | 0ffa43465d856b2647f31528be7399686bc9e940 (patch) | |
| tree | c9d28c2d8fd271170170d089c76866662596a233 /demos/qmediaplayer | |
| parent | 4676dd62871da2b58452ebda477a04c25158bec4 (diff) | |
| parent | ec4591334476d4fe7663c6e6fe1659138ea233fe (diff) | |
| download | Qt-0ffa43465d856b2647f31528be7399686bc9e940.zip Qt-0ffa43465d856b2647f31528be7399686bc9e940.tar.gz Qt-0ffa43465d856b2647f31528be7399686bc9e940.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:
Disabled QMediaPlayer states debug output.
Fixed typo in QMediaPlayer::play() error reporting
Fixed QVideoWidget test, waiting for video surface painted.
Tests; Fix media tests, make sure they are using mediaservies.
Fix warning about illegal empty declaration.
Three fixes from Shane after QtMultimedia was split into two dlls.
Fix compile errors in Direct Show media service.
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
QtMediaservices -> QtMediaServices.
configure; Fixes for changes to use mediaservices.
Fixed compile errors in pulseaudio backend for soundeffect
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Fixed compile errors with gstreamer plugin
Create Mediaservices lib, separate from Multimedia.
Gstreamer media backend: seek to media start on end of stream.
Diffstat (limited to 'demos/qmediaplayer')
0 files changed, 0 insertions, 0 deletions