diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-10 11:57:07 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-09-10 11:57:07 (GMT) |
| commit | f6495ee7a1427e377559e25616a35ba11f34e9c1 (patch) | |
| tree | 808056d2630c8fc4ca12d5aaead5d185780552b6 /src/3rdparty/phonon/mmf/mediaobject.cpp | |
| parent | 264a6a562f7870a9fd1af065aef4e979808bd1d2 (diff) | |
| download | Qt-f6495ee7a1427e377559e25616a35ba11f34e9c1.zip Qt-f6495ee7a1427e377559e25616a35ba11f34e9c1.tar.gz Qt-f6495ee7a1427e377559e25616a35ba11f34e9c1.tar.bz2 | |
Fixed problems with compiling for ARMV5
- Forward declaration of QScopedPointer containee type was causing an error
- Audio effect libraries were declared in the .pro file as e.g. -lBassBoostEffect.lib, causing toolchain to try to link statically
- Added several missing MMF:: namespace qualifiers
Diffstat (limited to 'src/3rdparty/phonon/mmf/mediaobject.cpp')
| -rw-r--r-- | src/3rdparty/phonon/mmf/mediaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/mmf/mediaobject.cpp b/src/3rdparty/phonon/mmf/mediaobject.cpp index f09b488..cf968f3 100644 --- a/src/3rdparty/phonon/mmf/mediaobject.cpp +++ b/src/3rdparty/phonon/mmf/mediaobject.cpp @@ -369,12 +369,12 @@ void MMF::MediaObject::setVideoOutput(VideoOutput* videoOutput) } -AbstractPlayer *MediaObject::abstractPlayer() const +AbstractPlayer *MMF::MediaObject::abstractPlayer() const { return m_player.data(); } -bool MediaObject::activateOnMediaObject(MediaObject *) +bool MMF::MediaObject::activateOnMediaObject(MediaObject *) { // Guess what, we do nothing. return true; |