diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 04:08:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 04:08:58 (GMT) |
| commit | b81108063a3d98f264a850ab740ff7005ffcba2d (patch) | |
| tree | 4859db52e2aaaa994466e29515dacb384ea25ffd /doc/src/snippets/code/src_script_qscriptcontext.cpp | |
| parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
| parent | 74706e6bd25f0a2a7e65925309c8774df1cc2ee8 (diff) | |
| download | Qt-b81108063a3d98f264a850ab740ff7005ffcba2d.zip Qt-b81108063a3d98f264a850ab740ff7005ffcba2d.tar.gz Qt-b81108063a3d98f264a850ab740ff7005ffcba2d.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
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 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions