diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-12 00:00:13 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-12 00:00:13 (GMT) |
| commit | 4fea304c18471ae4d13e2d172b5e6c3200bf4d58 (patch) | |
| tree | dd716b9cab94581ccc175755a4618ca4d69c999e /src/gui/kernel | |
| parent | fa1dbb123c69cf1078c56a0473ef8d6f2eea5d4d (diff) | |
| parent | 350416c26fccc79621ba986794e6f6b48f2e1fe2 (diff) | |
| download | Qt-4fea304c18471ae4d13e2d172b5e6c3200bf4d58.zip Qt-4fea304c18471ae4d13e2d172b5e6c3200bf4d58.tar.gz Qt-4fea304c18471ae4d13e2d172b5e6c3200bf4d58.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'src/gui/kernel')
| -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); |