Revert "Don't add qmutex_xxx.cpp to SOURCES, as qmutex.cpp #include's them"

This reverts commit 40cbf1927bdd2fa9f531a047d1ba66f68c35d170 -
the qmake parser bug this worked around has been fixed.

As a side effect, the platform conditionals were simplified.

Change-Id: Ibfc1253e3c2252ab954c725a9effd6e719cb691c
Reviewed-by: Edward Welbourne <edward.welbourne@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 15 insertions, 19 deletions

diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index 2cb00a6cf4..0a989cfcaf 100644
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -43,24 +43,20 @@ SOURCES += thread/qatomic.cpp \
            thread/qthreadpool.cpp \
            thread/qthreadstorage.cpp
 
-unix:SOURCES += thread/qthread_unix.cpp \
-                         thread/qwaitcondition_unix.cpp
-
-win32:SOURCES += thread/qthread_win.cpp \
-		 thread/qwaitcondition_win.cpp
-
-integrity:SOURCES += thread/qthread_unix.cpp \
-		thread/qwaitcondition_unix.cpp
-
-false {
-    # files #included by others, but listed here so IDEs parsing this file know
-    # they are part of QtCore. Usually, qmake can find out that certain files
-    # are #included by others and thus remove from SOURCES, but it gets lost
-    # with qmutex.cpp.
+win32 {
     SOURCES += \
-        thread/qmutex_linux.cpp \
-        thread/qmutex_mac.cpp \
-        thread/qmutex_unix.cpp \
-        thread/qmutex_win.cpp
+        thread/qmutex_win.cpp \
+        thread/qthread_win.cpp \
+        thread/qwaitcondition_win.cpp
+} else {
+    darwin {
+        SOURCES += thread/qmutex_mac.cpp
+    } else: linux {
+        SOURCES += thread/qmutex_linux.cpp
+    } else {
+        SOURCES += thread/qmutex_unix.cpp
+    }
+    SOURCES += \
+        thread/qthread_unix.cpp \
+        thread/qwaitcondition_unix.cpp
 }
-