2 files changed, 11 insertions, 2 deletions
diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp
index 03ab047..49fb46b 100644
--- a/src/corelib/thread/qmutexpool.cpp
+++ b/src/corelib/thread/qmutexpool.cpp
@@ -123,7 +123,8 @@ QMutexPool *QMutexPool::instance()
     return globalMutexPool();
 }
 
-/*!  \fn QMutexPool::get(void *address)
+/*!
+    \fn QMutexPool::get(const void *address)
     Returns a QMutex from the pool. QMutexPool uses the value \a address
     to determine which mutex is returned from the pool.
 */
diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index c515ae6..46339a6 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -335,7 +335,15 @@ void *QThreadPrivate::start(void *arg)
     createEventDispatcher(data);
 
     emit thr->started();
-    thr->run();
+    TRAPD(err, {
+        try {
+            thr->run();
+        } catch (const std::exception& ex) {
+            qWarning("QThreadPrivate::start: Thread exited on exception %s", ex.what());
+        }
+    });
+    if (err)
+        qWarning("QThreadPrivate::start: Thread exited on leave %d", err);
 
     QThreadPrivate::finish(arg);