diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 20:04:29 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-01 20:56:52 (GMT) |
| commit | 1f327a1de8db245d0b28e7dfdc5bca1af0b56782 (patch) | |
| tree | 3887c10d36886c99105dc4a4b908a46ec33aa7f9 /src/3rdparty/phonon/gstreamer | |
| parent | fe6057617a87ecb205680d262a02f70eea425045 (diff) | |
| download | Qt-1f327a1de8db245d0b28e7dfdc5bca1af0b56782.zip Qt-1f327a1de8db245d0b28e7dfdc5bca1af0b56782.tar.gz Qt-1f327a1de8db245d0b28e7dfdc5bca1af0b56782.tar.bz2 | |
Fix Phonon compilation with a namespaced Qt.
I'll upstream this patch myself.
Diffstat (limited to 'src/3rdparty/phonon/gstreamer')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/audiodataoutput.cpp | 6 | ||||
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/audiodataoutput.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp index 30dabdf..802cb18 100644 --- a/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp +++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp @@ -29,6 +29,9 @@ #include <QtCore/QMap> #include <phonon/audiooutput.h> +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { namespace Gstreamer @@ -138,6 +141,9 @@ void AudioDataOutput::mediaNodeEvent(const MediaNodeEvent *event) }} //namespace Phonon::Gstreamer +QT_END_NAMESPACE +QT_END_HEADER + #include "moc_audiodataoutput.cpp" // vim: sw=4 ts=4 diff --git a/src/3rdparty/phonon/gstreamer/audiodataoutput.h b/src/3rdparty/phonon/gstreamer/audiodataoutput.h index 5e30a1d..cd5ef49 100644 --- a/src/3rdparty/phonon/gstreamer/audiodataoutput.h +++ b/src/3rdparty/phonon/gstreamer/audiodataoutput.h @@ -29,6 +29,9 @@ #include <phonon/audiodataoutput.h> #include <phonon/audiodataoutputinterface.h> +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + namespace Phonon { namespace Gstreamer @@ -80,5 +83,8 @@ namespace Gstreamer }; }} //namespace Phonon::Gstreamer +QT_END_NAMESPACE +QT_END_HEADER + // vim: sw=4 ts=4 tw=80 #endif // Phonon_FAKE_AUDIODATAOUTPUT_H |