diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-10-18 07:51:15 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-10-20 11:56:28 (GMT) |
| commit | b895d7af3a75cbbc2b14a993679538ed02190b40 (patch) | |
| tree | 719b4cb2b051097dfea12e886f08554b7bd6d0d6 /src/corelib/thread | |
| parent | 4346b33024c76760752fc1dc4b46847883cd0453 (diff) | |
| download | Qt-b895d7af3a75cbbc2b14a993679538ed02190b40.zip Qt-b895d7af3a75cbbc2b14a993679538ed02190b40.tar.gz Qt-b895d7af3a75cbbc2b14a993679538ed02190b40.tar.bz2 | |
Lighthouse on OS X.
Reviewed-by: Jørgen
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 20c6fb7..5eba09c 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 @@ -358,7 +360,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) |