summaryrefslogtreecommitdiffstats
path: root/src/multimedia/base/qmediatimerange.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-26 08:31:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-26 08:31:37 (GMT)
commitd7616f00149a1d520f291fdb2b934bd36bbd7c90 (patch)
treebc9102f0de27982f793d555db4bf21b88fa8069d /src/multimedia/base/qmediatimerange.cpp
parentae13ad51dda7246e73d282165201f637d04a667e (diff)
parent755928a3b45d4abb62a758e215263e950b1bed41 (diff)
downloadQt-d7616f00149a1d520f291fdb2b934bd36bbd7c90.zip
Qt-d7616f00149a1d520f291fdb2b934bd36bbd7c90.tar.gz
Qt-d7616f00149a1d520f291fdb2b934bd36bbd7c90.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
Diffstat (limited to 'src/multimedia/base/qmediatimerange.cpp')
0 files changed, 0 insertions, 0 deletions