diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-27 08:45:30 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-27 08:45:30 (GMT) |
| commit | 9cea45515ef283c9a870c6f515da50d31addafcf (patch) | |
| tree | d14fdf2b17a2a52c90ac514c39ad60be200cc7d7 /src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h | |
| parent | 6749edd4c6f647c4963793183a452bb1ae769c1c (diff) | |
| parent | 13dff164d2ab13b1258d31693b67acebc8636890 (diff) | |
| download | Qt-9cea45515ef283c9a870c6f515da50d31addafcf.zip Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.gz Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h b/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h index 28b48af..d54a1fc 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideowidget.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOWIDGET_H #define QGSTREAMERVIDEOWIDGET_H -#include <QtMultimedia/qvideowidgetcontrol.h> +#include <QtMediaServices/qvideowidgetcontrol.h> #include "qgstreamervideorendererinterface.h" |