diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 02:44:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 02:44:55 (GMT) |
| commit | 17388e0ca41bd123003fd3703bad8616491b562c (patch) | |
| tree | e07c08070bb5f23fdd5f1cf1b4d42d13f07765a5 /src/3rdparty/phonon/gstreamer/qwidgetvideosink.h | |
| parent | 4fb6cae4dd0c6a90008780df606abb8a9e73cb2c (diff) | |
| parent | 1f802e16e6ab59dbf5ce450e2d6ef4db10dd7bb8 (diff) | |
| download | Qt-17388e0ca41bd123003fd3703bad8616491b562c.zip Qt-17388e0ca41bd123003fd3703bad8616491b562c.tar.gz Qt-17388e0ca41bd123003fd3703bad8616491b562c.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:
Remove references to evr based renderer from .pro.
Phonon core; compile fixes after merge.
Phonon qt7; Compile fixes after merge.
Phonon; complete integration.
Update Phonon CMakeLists.txt.
Update Phonon qt7 backend to 4.4.0.
Update Phonon ds9 backend to 4.4.0.
Update Phonon GStreamer backend to 4.4.0.
Update Phonon core to 4.4.0
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/qwidgetvideosink.h')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/qwidgetvideosink.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h index 73a494a..f83dba5 100644 --- a/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h +++ b/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h @@ -19,6 +19,7 @@ #define Phonon_GSTREAMER_VIDEOSINK_H #include "common.h" +#include "qwidgetvideosink.h" #include <QtCore/QByteArray> #include <QtCore/QEvent> |