From 3b93ff8f65f55209a5dd8634efc8c92cba2970f8 Mon Sep 17 00:00:00 2001
From: Tomi Vihria <tomi.vihria@nokia.com>
Date: Thu, 15 Sep 2011 16:53:35 +0300
Subject: Fix missing clean up stack panic for a new thread in Symbian

The clean up stack for a new thread was created in a too late phase for
a process that doesn't have symbianVersion string in its cache

Task-number: QT-5269
Reviewed-by: Murray Read
---
 src/corelib/thread/qthread_symbian.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index 46339a6..2ea1b44 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -324,13 +324,14 @@ void *QThreadPrivate::start(void *arg)
     data->threadId = QThread::currentThreadId();
     set_thread_data(data);
 
+    CTrapCleanup *cleanup = CTrapCleanup::New();
+    q_check_ptr(cleanup);
+
     {
         QMutexLocker locker(&thr->d_func()->mutex);
         data->quitNow = thr->d_func()->exited;
     }
 
-    CTrapCleanup *cleanup = CTrapCleanup::New();
-
     // ### TODO: allow the user to create a custom event dispatcher
     createEventDispatcher(data);
 
-- 
cgit v0.12