diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-04 09:14:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 09:14:17 +0200 |
| commit | 673160b9fd7b9a75336ba293dda7e64f3d732a80 (patch) | |
| tree | b37e0216a090fbc9ac19dd55ca5e2ba1af1ef7cb /src/corelib/thread/thread.pri | |
| parent | 9a652ed802d5ec1114ba97ad86eca8d2f25c53d9 (diff) | |
| parent | 92c998afb66a2ec900d50cab57929c0a97ad46ac (diff) | |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/corelib/thread/thread.pri')
| -rw-r--r-- | src/corelib/thread/thread.pri | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index 592ab1644b..309bf30d25 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -24,8 +24,7 @@ SOURCES += thread/qatomic.cpp \ thread/qthread.cpp \ thread/qthreadstorage.cpp -unix:!symbian:SOURCES += thread/qmutex_unix.cpp \ - thread/qthread_unix.cpp \ +unix:!symbian:SOURCES += thread/qthread_unix.cpp \ thread/qwaitcondition_unix.cpp symbian:SOURCES += thread/qmutex_symbian.cpp \ @@ -39,3 +38,9 @@ win32:SOURCES += thread/qmutex_win.cpp \ integrity:SOURCES += thread/qmutex_unix.cpp \ thread/qthread_unix.cpp \ thread/qwaitcondition_unix.cpp + +unix: { + macx-* { SOURCES += thread/qmutex_mac.cpp } + else:linux-* { SOURCES += thread/qmutex_linux.cpp } + else { SOURCES += thread/qmutex_unix.cpp } +} |