diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 06:09:12 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-30 06:09:12 (GMT) |
commit | 3e6a12e90d05d24bca68128d60215c207a416ef6 (patch) | |
tree | d38e9c7e8a703c86a88cae5b7080db1c3bdb1057 /src/gui/widgets/qtoolbar.h | |
parent | 0599478b270ae277121a55c6040acc15edd4d6eb (diff) | |
parent | 7adae4f0078fd9364081c66aa84431bf4a2108f5 (diff) | |
download | Qt-3e6a12e90d05d24bca68128d60215c207a416ef6.zip Qt-3e6a12e90d05d24bca68128d60215c207a416ef6.tar.gz Qt-3e6a12e90d05d24bca68128d60215c207a416ef6.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:
Fix crash in direct show media service with mingw and a video surface.
Rebuild configure.exe with updated symbian media backend check.
Don't disable the symbian media backend.
Gstreamer media backend: fixed embedded qt build
S60 mediaservices backend
Fix qdoc error in low-level audio
When deployed on symbian, give player application the standard QT icon
update multimedia qml element doc samples
Diffstat (limited to 'src/gui/widgets/qtoolbar.h')
0 files changed, 0 insertions, 0 deletions