diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-10 08:55:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-10 08:55:14 (GMT) |
| commit | 50adee71e94e13a04b5da9cc4975a897bcdb0477 (patch) | |
| tree | 0953e139093a93c7efaf0c57923a5c93289c7b4b /src/gui | |
| parent | 6c24cde00e3a046e6face6f08ec2ed996b54a8f1 (diff) | |
| parent | 6a1eca9c0b9e9c42c317f4e0f1f3a7b5f9e8756d (diff) | |
| download | Qt-50adee71e94e13a04b5da9cc4975a897bcdb0477.zip Qt-50adee71e94e13a04b5da9cc4975a897bcdb0477.tar.gz Qt-50adee71e94e13a04b5da9cc4975a897bcdb0477.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
WINSCW def file update so that qtgui can pick up virtual from qtcore
Add mobile-reduced ts-files for Symbian.
Preventing zero-timer lockups when Symbian's active scheduler used
Fix memory leak in S60Style
Improve whatlog generation for Symbian tools2 builds.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index eb59115..08884d8 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -1347,7 +1347,9 @@ QS60StylePrivate::QS60StylePrivate() void QS60StylePrivate::removeAnimations() { //currently only one animation in the list. - m_animations()->removeFirst(); + if (!m_animations()->isEmpty()) { + delete m_animations()->takeFirst(); + } } QColor QS60StylePrivate::s60Color(QS60StyleEnums::ColorLists list, |