diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
| commit | 2ed925753cb194970712330edca4da8e91fa8f28 (patch) | |
| tree | d06c72229e1afeac25989a5409b052fa5cefeda6 /src/3rdparty/phonon/gstreamer/videowidget.cpp | |
| parent | cf800465369fb1ef84e8bddbbbfa7128d95afd27 (diff) | |
| parent | 5e0bdffd92cbff2a9eb551f77850a24bf2a2116a (diff) | |
| download | Qt-2ed925753cb194970712330edca4da8e91fa8f28.zip Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.gz Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.bz2 | |
Merge branch 'feature' into 4.6
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/videowidget.cpp')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/videowidget.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/gstreamer/videowidget.cpp b/src/3rdparty/phonon/gstreamer/videowidget.cpp index efc750a..e1f0ec9 100644 --- a/src/3rdparty/phonon/gstreamer/videowidget.cpp +++ b/src/3rdparty/phonon/gstreamer/videowidget.cpp @@ -33,6 +33,7 @@ #include "widgetrenderer.h" #include "x11renderer.h" +#ifndef QT_NO_PHONON_VIDEO QT_BEGIN_NAMESPACE namespace Phonon @@ -383,5 +384,6 @@ void VideoWidget::mediaNodeEvent(const MediaNodeEvent *event) } //namespace Phonon::Gstreamer QT_END_NAMESPACE +#endif //QT_NO_PHONON_VIDEO #include "moc_videowidget.cpp" |