diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-08 15:38:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-08 15:38:37 (GMT) |
| commit | ca4213b45f5f65ebbc7e5143a2940f87c5ca28fa (patch) | |
| tree | d26e673cf7419468007b90ea4cf3e73ecbf00fe6 /src/3rdparty/phonon | |
| parent | 3d852b4b4b6834688519e8a992ecaef391f8bde9 (diff) | |
| parent | 50e7bea8bb4ce5a97ab8ff9c7062fc0fa092aec0 (diff) | |
| download | Qt-ca4213b45f5f65ebbc7e5143a2940f87c5ca28fa.zip Qt-ca4213b45f5f65ebbc7e5143a2940f87c5ca28fa.tar.gz Qt-ca4213b45f5f65ebbc7e5143a2940f87c5ca28fa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed compilerwarnings regression in public headers.
Fix duplicate definition error
Fix namespace error
Fix the broken QPixmap::fromSymbianRSgImage().
Fix native child window Symbian decoration handling.
Fixed "not a valid preprocessing token" on GCCE.
Avoided the Linux version of the --no-undefined switch.
Added missing edllstub.lib for GCCE.
symbian/linux-gcce: Use -u _E32Dll when linking DLLs
Revert "Implement Symbian support for enable_backup CONFIG value"
Implement Symbian support for enable_backup CONFIG value
Fix deployment issues with networkselftest
Fix random crashes when bearer suddenly goes down
Fixed a bug where the softkeys would leave a see-through "hole".
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/mmf/abstractaudioeffect.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractaudioeffect.h b/src/3rdparty/phonon/mmf/abstractaudioeffect.h index 70adcf6..517a334 100644 --- a/src/3rdparty/phonon/mmf/abstractaudioeffect.h +++ b/src/3rdparty/phonon/mmf/abstractaudioeffect.h @@ -124,7 +124,7 @@ private: #define PHONON_MMF_DEFINE_EFFECT_FUNCTIONS(Effect) \ \ -void Effect##::createEffect(AudioPlayer::NativePlayer *player) \ +void Effect::createEffect(AudioPlayer::NativePlayer *player) \ { \ C##Effect *ptr = 0; \ QT_TRAP_THROWING(ptr = C##Effect::NewL(*player)); \ |