Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

2 files changed, 15 insertions, 25 deletions

diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 635282d5c4..ef1799a021 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -37,12 +37,6 @@
 **
 ****************************************************************************/
 
-//#define WINVER 0x0500
-#if !defined(WINAPI_FAMILY) && (_WIN32_WINNT < 0x0400)
-#define _WIN32_WINNT 0x0400
-#endif
-
-
 #include "qthread.h"
 #include "qthread_p.h"
 #include "qthreadstorage.h"
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
 }
-