diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 10:23:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 10:23:01 (GMT) |
| commit | 91ed4f664008577a095f5554372456661865dede (patch) | |
| tree | bae0cce0445433cf4fded4c107eb821b5a47da8c /demos/declarative/minehunt/Description.qml | |
| parent | 3db40b0be40c946f547f238ed3f0af813892115e (diff) | |
| parent | 4325feb3b93a7676e0b2d0301b8a17f69ffa7c1e (diff) | |
| download | Qt-91ed4f664008577a095f5554372456661865dede.zip Qt-91ed4f664008577a095f5554372456661865dede.tar.gz Qt-91ed4f664008577a095f5554372456661865dede.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:
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 'demos/declarative/minehunt/Description.qml')
0 files changed, 0 insertions, 0 deletions