diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-03 11:52:16 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-03 11:52:16 (GMT) |
| commit | 2e02518498379fc691a27ec96ae182aff436a38d (patch) | |
| tree | 1ed6ce158c8de6507b36ae2b70133edbc6beca5d /src/3rdparty/phonon/gstreamer/abstractrenderer.h | |
| parent | fc4a3206fd89d28c0b0c6c36fa0c136a65e2e057 (diff) | |
| parent | 9fab0ede200960f0dbec1457757a6ba3214c3ce6 (diff) | |
| download | Qt-2e02518498379fc691a27ec96ae182aff436a38d.zip Qt-2e02518498379fc691a27ec96ae182aff436a38d.tar.gz Qt-2e02518498379fc691a27ec96ae182aff436a38d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/abstractrenderer.h')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/abstractrenderer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/gstreamer/abstractrenderer.h b/src/3rdparty/phonon/gstreamer/abstractrenderer.h index 140413d..10a2822 100644 --- a/src/3rdparty/phonon/gstreamer/abstractrenderer.h +++ b/src/3rdparty/phonon/gstreamer/abstractrenderer.h @@ -23,6 +23,7 @@ #include "medianode.h" #include <phonon/videowidget.h> +#ifndef QT_NO_PHONON_VIDEO QT_BEGIN_NAMESPACE class QString; @@ -58,5 +59,5 @@ protected: } //namespace Phonon::Gstreamer QT_END_NAMESPACE - +#endif //QT_NO_PHONON_VIDEO #endif // Phonon_GSTREAMER_ABSTRACTRENDERER_H |