diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 08:23:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 08:23:11 (GMT) |
| commit | b3ccc9b30c3a176021b6205193b8baa416e9e813 (patch) | |
| tree | bc7ce3bc52c142c83dad59fbe71564ac01c49713 /src/gui/graphicsview/qgraphicslinearlayout.cpp | |
| parent | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (diff) | |
| parent | 5a3b9d3daf64ea686427478391d3773c5a1e024e (diff) | |
| download | Qt-b3ccc9b30c3a176021b6205193b8baa416e9e813.zip Qt-b3ccc9b30c3a176021b6205193b8baa416e9e813.tar.gz Qt-b3ccc9b30c3a176021b6205193b8baa416e9e813.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:
WaveDecoder; be more permissive in handling of wave file formats.
Debug media player status and media state changes.
Added playlist playback modes combo box to player demo
Added QMediaPlayer::StreamPlayback flag to query/select backend capable
Diffstat (limited to 'src/gui/graphicsview/qgraphicslinearlayout.cpp')
0 files changed, 0 insertions, 0 deletions