1 files changed, 3 insertions, 23 deletions
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index 3c46212c16..9600afd220 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -665,9 +665,7 @@ void tst_QThread::usleep()
 typedef void (*FunctionPointer)(void *);
 void noop(void*) { }
 
-#ifdef Q_OS_SYMBIAN
-typedef RThread ThreadHandle;
-#elif defined Q_OS_UNIX
+#if defined Q_OS_UNIX
     typedef pthread_t ThreadHandle;
 #elif defined Q_OS_WIN
     typedef HANDLE ThreadHandle;
@@ -698,7 +696,6 @@ public:
 protected:
     static void *runUnix(void *data);
     static unsigned WIN_FIX_STDCALL runWin(void *data);
-    static int runSymbian(void *data);
 
     FunctionPointer functionPointer;
     void *data;
@@ -708,10 +705,7 @@ void NativeThreadWrapper::start(FunctionPointer functionPointer, void *data)
 {
     this->functionPointer = functionPointer;
     this->data = data;
-#ifdef Q_OS_SYMBIAN
-    qt_symbian_throwIfError(nativeThreadHandle.Create(KNullDesC(), NativeThreadWrapper::runSymbian, 1024, &User::Allocator(), this));
-    nativeThreadHandle.Resume();
-#elif defined Q_OS_UNIX
+#if defined Q_OS_UNIX
     const int state = pthread_create(&nativeThreadHandle, 0, NativeThreadWrapper::runUnix, this);
     Q_UNUSED(state);
 #elif defined(Q_OS_WINCE)
@@ -731,12 +725,7 @@ void NativeThreadWrapper::startAndWait(FunctionPointer functionPointer, void *da
 
 void NativeThreadWrapper::join()
 {
-#ifdef Q_OS_SYMBIAN
-    TRequestStatus stat;
-    nativeThreadHandle.Logon(stat);
-    User::WaitForRequest(stat);
-    nativeThreadHandle.Close();
-#elif defined Q_OS_UNIX
+#if defined Q_OS_UNIX
     pthread_join(nativeThreadHandle, 0);
 #elif defined Q_OS_WIN
     WaitForSingleObject(nativeThreadHandle, INFINITE);
@@ -776,12 +765,6 @@ unsigned WIN_FIX_STDCALL NativeThreadWrapper::runWin(void *data)
     return 0;
 }
 
-int NativeThreadWrapper::runSymbian(void *data)
-{
-    runUnix(data);
-    return 0;
-}
-
 void NativeThreadWrapper::stop()
 {
     QMutexLocker lock(&mutex);
@@ -976,9 +959,6 @@ void tst_QThread::adoptMultipleThreadsOverlap()
     // need to test lots of threads, so that we exceed MAXIMUM_WAIT_OBJECTS in qt_adopted_thread_watcher()
     const int numThreads = 200;
 #  endif
-#elif defined(Q_OS_SYMBIAN)
-    // stress the monitoring thread's add function
-    const int numThreads = 100;
 #else
     const int numThreads = 5;
 #endif