diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 13:52:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 13:52:10 (GMT) |
| commit | ef30a6f336d55c813423bf139d8363f50181179f (patch) | |
| tree | ea639d96d8283b53b448781f8e5024ce0801b87a /tests/auto/qobject/.gitignore | |
| parent | 3dd48b423b3651e296d845cf734347bfb48d3137 (diff) | |
| parent | 754c72b54409f4ed124f5ba53a20f0bfc53e448d (diff) | |
| download | Qt-ef30a6f336d55c813423bf139d8363f50181179f.zip Qt-ef30a6f336d55c813423bf139d8363f50181179f.tar.gz Qt-ef30a6f336d55c813423bf139d8363f50181179f.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:
QMediaContent test; make sure to use network.
Rebuild configure.exe
Add -mediaservice argument to configure.
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
Diffstat (limited to 'tests/auto/qobject/.gitignore')
0 files changed, 0 insertions, 0 deletions