diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-04-27 00:39:42 (GMT) |
| commit | 88b2bf18c558d0e2f8a9268802f277212f17e61e (patch) | |
| tree | d41ca52003037fba9b45605aa6d2ed86f73b940a /src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h | |
| parent | 4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66 (diff) | |
| parent | 09293f1d07b019dc7bfe95afb93364cc87774e82 (diff) | |
| download | Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.zip Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.gz Qt-88b2bf18c558d0e2f8a9268802f277212f17e61e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h')
| -rw-r--r-- | src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h index acb2937..9b857ce 100644 --- a/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h +++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowvideooutputcontrol.h @@ -42,7 +42,7 @@ #ifndef DIRECTSHOWVIDEOUTPUTCONTROL_H #define DIRECTSHOWVIDEOOUPUTCONTROL_H -#include <QtMultimedia/qvideooutputcontrol.h> +#include <QtMediaServices/qvideooutputcontrol.h> QT_BEGIN_HEADER |