summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-08 09:16:56 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-08 09:16:56 (GMT)
commitdf07da9730db0fb8f4fdc515671e89bf4964fb78 (patch)
treea9661aa0963427999f60a75cf7a07f38590eaca8
parent7f18116cbf6bcae95473ff2d41929ddef66f74c9 (diff)
downloadQt-df07da9730db0fb8f4fdc515671e89bf4964fb78.zip
Qt-df07da9730db0fb8f4fdc515671e89bf4964fb78.tar.gz
Qt-df07da9730db0fb8f4fdc515671e89bf4964fb78.tar.bz2
Fix bad merge
Code was removed in that commit 834ad29849ebef99d7e5c516cde26d550abff7cd But the merge d54b3f04fa629fe031f1083073eef0145f0d6b1e reintroduced it back
-rw-r--r--src/corelib/thread/qthread_unix.cpp16
1 files changed, 0 insertions, 16 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 89546b6..044eb05 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -280,22 +280,6 @@ void *QThreadPrivate::start(void *arg)
thr->setPriority(QThread::Priority(thr->d_func()->priority & ~ThreadPriorityResetFlag));
}
-#ifdef Q_OS_SYMBIAN
- // Because Symbian Open C does not provide a way to convert between
- // RThread and pthread_t, we must delay initialization of the RThread
- // handle when creating a thread, until we are running in the new thread.
- // Here, we pick up the current thread and assign that to the handle.
- init_symbian_thread_handle(data->symbian_thread_handle);
-
- // On symbian, threads other than the main thread are non critical by default
- // This means a worker thread can crash without crashing the application - to
- // use this feature, we would need to use RThread::Logon in the main thread
- // to catch abnormal thread exit and emit the finished signal.
- // For the sake of cross platform consistency, we set the thread as process critical
- // - advanced users who want the symbian behaviour can change the critical
- // attribute of the thread again once the app gains control in run()
- User::SetCritical(User::EProcessCritical);
-#endif
data->threadId = (Qt::HANDLE)pthread_self();
set_thread_data(data);