diff -r 56cd8111b7f7 -r 41300fa6a67c src/3rdparty/phonon/gstreamer/streamreader.cpp --- a/src/3rdparty/phonon/gstreamer/streamreader.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/src/3rdparty/phonon/gstreamer/streamreader.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -20,7 +20,7 @@ #include QT_BEGIN_NAMESPACE - +#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM namespace Phonon { namespace Gstreamer @@ -49,5 +49,6 @@ } } +#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM QT_END_NAMESPACE