Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (388 commits)
  Fix the license in files for Lighthouse
  Fix typos found by the spellchecking autotest
  Add missing QT_MODULE macros.
  Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT
  Compile fix for RVCT 4
  Fix QT_BLITTER_RASTEROVERLAY and namespace error
  Lighthouse: initial COCOA plugin
  Lighthouse on OS X.
  Fix QWS generic mac mkspec
  actually set egl swap interval
  Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
  Update sections if model content changes.
  Don't clobber the tty by default
  Add touch offset
  Jitter removal
  Mouse event compression
  Add keycodes for some additional multimedia keys
  Make it possible to choose some EGLFS configuration options via envvars
  use swapInterval=1 by default in EglFS to potentially avoid tearing
  Lighthouse: make QFontconfigDatabase not override application font
  ...

1 files changed, 5 insertions, 1 deletions

diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index a44a0e8..daf1a93 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -83,7 +83,9 @@
 #   define old_qDebug qDebug
 #   undef qDebug
 # endif
+#ifndef QT_NO_CORESERVICES
 # include <CoreServices/CoreServices.h>
+#endif //QT_NO_CORESERVICES
 
 # ifdef old_qDebug
 #   undef qDebug
@@ -388,7 +390,7 @@ int QThread::idealThreadCount()
 {
     int cores = -1;
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MAC) && !defined(Q_WS_QPA)
     // Mac OS X
     cores = MPProcessorsScheduled();
 #elif defined(Q_OS_HPUX)
@@ -506,6 +508,7 @@ void QThread::usleep(unsigned long usecs)
 // Does some magic and calculate the Unix scheduler priorities
 // sched_policy is IN/OUT: it must be set to a valid policy before calling this function
 // sched_priority is OUT only
+#if defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
 static bool calculateUnixPriority(int priority, int *sched_policy, int *sched_priority)
 {
 #ifdef SCHED_IDLE
@@ -533,6 +536,7 @@ static bool calculateUnixPriority(int priority, int *sched_policy, int *sched_pr
     *sched_priority = prio;
     return true;
 }
+#endif
 
 void QThread::start(Priority priority)
 {