diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 04:10:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-16 04:10:38 (GMT) |
| commit | 83a8523c9a33ccfadb8a06d5043b6e713330ff03 (patch) | |
| tree | 02b7916a7040ba820ab59bfb7a76e89312f58bed /src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h | |
| parent | 140a96d0b860b045c18d53c1ac96e77b3893d31c (diff) | |
| parent | 6514ecd97cb455082b6e6a3521dee7c623e6393d (diff) | |
| download | Qt-83a8523c9a33ccfadb8a06d5043b6e713330ff03.zip Qt-83a8523c9a33ccfadb8a06d5043b6e713330ff03.tar.gz Qt-83a8523c9a33ccfadb8a06d5043b6e713330ff03.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:
Add EXPORT defines for QtMediaServices library.
Fixed configure check for gstreamer.
WebKit; build with change to mediaservices.
QtMediaservices -> QtMediaServices.
configure; Fixes for changes to use mediaservices.
Fixed compile errors in pulseaudio backend for soundeffect
Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d
Fixed compile errors with gstreamer plugin
Create Mediaservices lib, separate from Multimedia.
Gstreamer media backend: seek to media start on end of stream.
Diffstat (limited to 'src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h b/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h index 7685239..6d7d47f 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h +++ b/src/plugins/mediaservices/gstreamer/qgstreamervideooutputcontrol.h @@ -42,7 +42,7 @@ #ifndef QGSTREAMERVIDEOOUTPUTCONTROL_H #define QGSTREAMERVIDEOOUTPUTCONTROL_H -#include <QtMultimedia/qvideooutputcontrol.h> +#include <QtMediaServices/qvideooutputcontrol.h> #include <gst/gst.h> |