diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 10:46:57 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 10:46:57 (GMT) |
commit | 683cca297d29e7ea9f84c087a3c081dcccea48fb (patch) | |
tree | 88ca39218e1fedf94751b927d7e04944a4c66e16 /src/3rdparty/phonon/mmf/backend.cpp | |
parent | 338fe3c15e90d62606806b0845bb621dd05153ae (diff) | |
parent | fa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff) | |
download | Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.zip Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.gz Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'src/3rdparty/phonon/mmf/backend.cpp')
-rw-r--r-- | src/3rdparty/phonon/mmf/backend.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/backend.cpp b/src/3rdparty/phonon/mmf/backend.cpp index f542ec9..cac27e3 100644 --- a/src/3rdparty/phonon/mmf/backend.cpp +++ b/src/3rdparty/phonon/mmf/backend.cpp @@ -24,6 +24,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>. #include <apmstd.h> // for TDataType #include "abstractaudioeffect.h" +#include "ancestormovemonitor.h" #include "audiooutput.h" #include "audioplayer.h" #include "backend.h" @@ -45,7 +46,9 @@ using namespace Phonon::MMF; \internal */ -Backend::Backend(QObject *parent) : QObject(parent) +Backend::Backend(QObject *parent) + : QObject(parent) + , m_ancestorMoveMonitor(new AncestorMoveMonitor(this)) { TRACE_CONTEXT(Backend::Backend, EBackend); TRACE_ENTRY_0(); @@ -87,7 +90,7 @@ QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const return EffectFactory::createAudioEffect(effect, parent); } case VideoWidgetClass: - result = new VideoWidget(qobject_cast<QWidget *>(parent)); + result = new VideoWidget(m_ancestorMoveMonitor.data(), qobject_cast<QWidget *>(parent)); break; default: |