Fixed thread priority code

The thread priority setting code was not dealing with the inherit case
correctly. Now that it is, the wait condition delay hack has been
removed.

Task-number: QTBUG-13990
Reviewed-by: Shane Kearns

1 files changed, 4 insertions, 15 deletions

diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index d1e2eaa..b68453c 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -40,20 +40,11 @@
 ****************************************************************************/
 
 #include "qthread.h"
-
 #include "qplatformdefs.h"
-
 #include <private/qcoreapplication_p.h>
-#if !defined(QT_NO_GLIB)
-#  include "../kernel/qeventdispatcher_glib_p.h"
-#endif
-
 #include <private/qeventdispatcher_symbian_p.h>
-
 #include "qthreadstorage.h"
-
 #include "qthread_p.h"
-
 #include "qdebug.h"
 
 #include <sched.h>
@@ -281,11 +272,6 @@ Qt::HANDLE QThread::currentThreadId()
     return (Qt::HANDLE) (TUint) RThread().Id();
 }
 
-#if defined(QT_LINUXBASE) && !defined(_SC_NPROCESSORS_ONLN)
-// LSB doesn't define _SC_NPROCESSORS_ONLN.
-#  define _SC_NPROCESSORS_ONLN 84
-#endif
-
 int QThread::idealThreadCount()
 {
     int cores = -1;
@@ -351,9 +337,12 @@ TThreadPriority calculateSymbianPriority(QThread::Priority priority)
             break;
         case QThread::HighestPriority:
         case QThread::TimeCriticalPriority:
-        default:
             symPriority = EPriorityMuchMore;
             break;
+        case QThread::InheritPriority:
+        default:
+            symPriority = RThread().Priority();
+            break;
     }
     return symPriority;
     }