summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-11 13:48:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-11 13:48:47 (GMT)
commita3fe722adf1b2dd1f637b28635ac895a39a81ba9 (patch)
tree535b6bd29d49869c85c0dd8c453a8107f1fd5de5 /src/corelib/kernel
parent2b22c063bebbc545121e53e0728211dbd02cb337 (diff)
parentae99c838f6737e2e2316ac36bc80c016620b406e (diff)
downloadQt-a3fe722adf1b2dd1f637b28635ac895a39a81ba9.zip
Qt-a3fe722adf1b2dd1f637b28635ac895a39a81ba9.tar.gz
Qt-a3fe722adf1b2dd1f637b28635ac895a39a81ba9.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: Fix memory leak in QCursorData Create cleanup stack in idleDetectorThread
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index ef331f6..ea466f5 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -923,10 +923,15 @@ private:
void IdleLoop()
{
+ // Create cleanup stack.
+ // Mutex handling may contain cleanupstack usage.
+ CTrapCleanup *cleanup = CTrapCleanup::New();
+ q_check_ptr(cleanup);
while (!m_stop) {
m_kick.acquire();
m_state = STATE_RUN;
}
+ delete cleanup;
}
static void StopIdleDetectorThread();