summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@accenture.com>2011-04-12 11:14:15 (GMT)
committerShane Kearns <shane.kearns@accenture.com>2011-04-12 11:14:15 (GMT)
commit61e7617f4afdd5cc1956de9ee2c7172ba95956d0 (patch)
tree7e442811e48e007a3d8c656c67bc0fb0332c3b5a /src/corelib
parentbd0e934769d37c270abcc3b29df407e93913ad3a (diff)
downloadQt-61e7617f4afdd5cc1956de9ee2c7172ba95956d0.zip
Qt-61e7617f4afdd5cc1956de9ee2c7172ba95956d0.tar.gz
Qt-61e7617f4afdd5cc1956de9ee2c7172ba95956d0.tar.bz2
Fix regression with Qt::AutoConnection
Change df9491b302f6404ad2ccc6dc2eb3377176d994c6 optimised auto connections by comparing thread ID rather than comparing TLS addresses. However it was implemented on a branch that didn't have the native symbian threads. So merging the two branches caused a regression without merge conflicts. Reviewed-by: mread
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/thread/qthread_symbian.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index 1474b36..15e6898 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -113,6 +113,7 @@ QThreadData *QThreadData::current()
}
data->deref();
}
+ data->threadId = QThread::currentThreadId();
if (!QCoreApplicationPrivate::theMainThread)
QCoreApplicationPrivate::theMainThread = data->thread;
}
@@ -312,6 +313,7 @@ void *QThreadPrivate::start(void *arg)
// attribute of the thread again once the app gains control in run()
User::SetCritical(User::EProcessCritical);
+ data->threadId = QThread::currentThreadId();
set_thread_data(data);
{