diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 13:49:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-07 13:49:30 (GMT) |
| commit | 6ff95852da22ba8843a2913c92aa37af36236ca0 (patch) | |
| tree | ecafb15fdcee2f3bede4df9fb481716b301cf365 /src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.cpp | |
| parent | d6cb7c903069e1dfde3ffc69649354c97d160b68 (diff) | |
| parent | 7eae08aa3a6219d250b8da199fa5ba71329764ae (diff) | |
| download | Qt-6ff95852da22ba8843a2913c92aa37af36236ca0.zip Qt-6ff95852da22ba8843a2913c92aa37af36236ca0.tar.gz Qt-6ff95852da22ba8843a2913c92aa37af36236ca0.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 build error for S60 3.1 winscw target
Gstreamer mediaservice backend: fixed check for X11/QWS build.
Diffstat (limited to 'src/plugins/mediaservices/directshow/mediaplayer/vmr9videowindowcontrol.cpp')
0 files changed, 0 insertions, 0 deletions