summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-10 09:02:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-10 09:02:26 (GMT)
commitf1b6791d239d175d9ba2532e0c8e931f5b150246 (patch)
tree084cd135e86454e84a4243f3b0a6b2d20b44510e
parent6a1eca9c0b9e9c42c317f4e0f1f3a7b5f9e8756d (diff)
parent0673a90310fe8deae9583f0a4f19885995cfb6ce (diff)
downloadQt-f1b6791d239d175d9ba2532e0c8e931f5b150246.zip
Qt-f1b6791d239d175d9ba2532e0c8e931f5b150246.tar.gz
Qt-f1b6791d239d175d9ba2532e0c8e931f5b150246.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: Create cleanup stack in idleDetectorThread
-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();