diff -r 41300fa6a67c -r f7bc934e204c src/3rdparty/phonon/mmf/backend.h --- a/src/3rdparty/phonon/mmf/backend.h Tue Feb 02 00:43:10 2010 +0200 +++ b/src/3rdparty/phonon/mmf/backend.h Wed Mar 31 11:06:36 2010 +0300 @@ -19,10 +19,14 @@ #ifndef PHONON_MMF_BACKEND_H #define PHONON_MMF_BACKEND_H +#ifndef PHONON_MMF_VIDEO_SURFACES #include "ancestormovemonitor.h" +#endif -#include -#include +#include "effectfactory.h" + +#include +#include #include QT_BEGIN_NAMESPACE @@ -52,7 +56,10 @@ void objectDescriptionChanged(ObjectDescriptionType); private: +#ifndef PHONON_MMF_VIDEO_SURFACES QScopedPointer m_ancestorMoveMonitor; +#endif + QScopedPointer m_effectFactory; }; }