diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:20:15 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-18 14:20:15 (GMT) |
commit | f6555ca5d188eef577da6aa21d8a5d28e094a33a (patch) | |
tree | 1c91b3e753edb3534a5b82c367b2f237d2a0bd5d /src/3rdparty/phonon/mmf/mediaobject.cpp | |
parent | fb4e81bdc692efe0db9aa38dd2b941578c0f0370 (diff) | |
parent | 7b41d3937c4521ba74b421da26d3a61a7aa4aa6e (diff) | |
download | Qt-f6555ca5d188eef577da6aa21d8a5d28e094a33a.zip Qt-f6555ca5d188eef577da6aa21d8a5d28e094a33a.tar.gz Qt-f6555ca5d188eef577da6aa21d8a5d28e094a33a.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
configure.exe
Diffstat (limited to 'src/3rdparty/phonon/mmf/mediaobject.cpp')
-rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index f004fd7..e42e0fa 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -359,11 +359,6 @@ void MMF::MediaObject::setTransitionTime(qint32 time) m_player->setTransitionTime(time); } - -//----------------------------------------------------------------------------- -// VolumeObserver -//----------------------------------------------------------------------------- - void MMF::MediaObject::volumeChanged(qreal volume) { m_player->volumeChanged(volume); |