diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 12:06:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 12:06:23 (GMT) |
| commit | e8413b8b52abd4f9758b3c7f631f87e957f3958a (patch) | |
| tree | 31f6f1cbd2ae906e3b52b59996f41ab2b5d9f8ed /src/3rdparty | |
| parent | f101d46ccd4795fc672b5b6c9e24151df319d725 (diff) | |
| parent | 1d021032f6920fe90bc23a028ae15ab434868363 (diff) | |
| download | Qt-e8413b8b52abd4f9758b3c7f631f87e957f3958a.zip Qt-e8413b8b52abd4f9758b3c7f631f87e957f3958a.tar.gz Qt-e8413b8b52abd4f9758b3c7f631f87e957f3958a.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix bold text rendering of Thai and Vietnamese on Symbian
Event dispatcher slow down using delays rather than thread priority
Fixed incorrect runtime platform version check in Phonon MMF backend
Removing unused code.
Support 'Text' mode in Symbian specific input methods
Map Symbian touch points to the screen's coordinate system.
Revert "Event dispatcher slow down using delays rather than thread priority"
Fixed a leak in QTextDocument::print().
Fix crash in QDBusInterface when invoking a method in a derived class.
tst_selftest: Fix off-by-one error in cleaning up line numbers and filenames
Fix long menu item texts causing crash
Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent.
Diffstat (limited to 'src/3rdparty')
| -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; |