diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-08 15:23:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-08 15:23:09 (GMT) |
| commit | 0cd6faa977a76f34cc58db629e4f8aea24b87f27 (patch) | |
| tree | a157f0470cdcfc17233df79ee6678eb1ec36548c | |
| parent | 759beb66b50b48f0fe391ad90288154d185bd9bf (diff) | |
| parent | 345c3f3502832e4850a6d9ea330ddca0c6e9c8bd (diff) | |
| download | Qt-0cd6faa977a76f34cc58db629e4f8aea24b87f27.zip Qt-0cd6faa977a76f34cc58db629e4f8aea24b87f27.tar.gz Qt-0cd6faa977a76f34cc58db629e4f8aea24b87f27.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix memory leak in S60Style
| -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, |