diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-10 14:48:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-10 14:48:56 (GMT) |
| commit | ae99c838f6737e2e2316ac36bc80c016620b406e (patch) | |
| tree | 40d70a28340e654cda6f73b5a0f8be94fc287fc3 | |
| parent | f1b6791d239d175d9ba2532e0c8e931f5b150246 (diff) | |
| parent | 120199e1ba102fb294e580b2905e370c15ebf2d0 (diff) | |
| download | Qt-ae99c838f6737e2e2316ac36bc80c016620b406e.zip Qt-ae99c838f6737e2e2316ac36bc80c016620b406e.tar.gz Qt-ae99c838f6737e2e2316ac36bc80c016620b406e.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 QCursorData
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 46b16cb..fe239f5 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -65,6 +65,7 @@ #ifdef QT_GRAPHICSSYSTEM_RUNTIME #include "private/qgraphicssystem_runtime_p.h" #endif +#include "private/qcursor_p.h" #include "apgwgnam.h" // For CApaWindowGroupName #include <mdaaudiotoneplayer.h> // For CMdaAudioToneUtility @@ -2098,6 +2099,10 @@ void qt_cleanup() // Call EndFullScreen() to prevent confusing the system effect state machine. qt_endFullScreenEffect(); +#ifndef QT_NO_CURSOR + QCursorData::cleanup(); +#endif + if (S60->qtOwnsS60Environment) { // Restore the S60 framework trap handler. See qt_init(). User::SetTrapHandler(S60->s60InstalledTrapHandler); |