diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-01 21:38:09 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-01 21:38:09 (GMT) |
commit | 1d021032f6920fe90bc23a028ae15ab434868363 (patch) | |
tree | d03fbde992158177aeb22d83e0412c58f189197b /src/3rdparty/phonon | |
parent | 36a5ecba6ca65e8445fa9b391e239f62c2002159 (diff) | |
parent | fef0ec67bf1b49221b3f383f6ea1c9a65fc08c57 (diff) | |
download | Qt-1d021032f6920fe90bc23a028ae15ab434868363.zip Qt-1d021032f6920fe90bc23a028ae15ab434868363.tar.gz Qt-1d021032f6920fe90bc23a028ae15ab434868363.tar.bz2 |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Diffstat (limited to 'src/3rdparty/phonon')
-rw-r--r-- | src/3rdparty/phonon/mmf/audioplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/mmf/audioplayer.cpp b/src/3rdparty/phonon/mmf/audioplayer.cpp index 77a0964..f49e898 100644 --- a/src/3rdparty/phonon/mmf/audioplayer.cpp +++ b/src/3rdparty/phonon/mmf/audioplayer.cpp @@ -99,7 +99,7 @@ int MMF::AudioPlayer::setDeviceVolume(int mmfVolume) * stack by doing a runtime check of the SDK version. */ #if !defined(__SERIES60_31__) const int err = m_player->SetVolume(mmfVolume); - if (QSysInfo::s60Version() >= QSysInfo::SV_S60_5_0) + if (QSysInfo::s60Version() >= QSysInfo::SV_S60_3_2) return err; else return KErrNone; |