Modernize the "thread" feature

Add it to configure.json and replace all occurrences of QT_NO_THREAD
with QT_CONFIG(thread). Add conditions for other features that depend
on thread support. Remove conditions where we can use the QMutex and
QThreadStorage stubs.

Change-Id: I284e5d794fda9a4c6f4a1ab29e55aa686272a0eb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 59 insertions, 51 deletions

diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
index dae72564b4..22f0de0523 100644
--- a/src/corelib/thread/thread.pri
+++ b/src/corelib/thread/thread.pri
@@ -1,38 +1,66 @@
 # Qt core thread module
 
-# public headers
-HEADERS += thread/qmutex.h \
-           thread/qrunnable.h \
-           thread/qreadwritelock.h \
-           thread/qsemaphore.h \
-           thread/qthread.h \
-           thread/qthreadpool.h \
-           thread/qthreadstorage.h \
-           thread/qwaitcondition.h \
-           thread/qatomic.h \
-           thread/qatomic_bootstrap.h \
-           thread/qatomic_cxx11.h \
-           thread/qbasicatomic.h \
-           thread/qgenericatomic.h
+HEADERS += \
+    thread/qmutex.h \
+    thread/qreadwritelock.h \
+    thread/qrunnable.h \
+    thread/qthread.h \
+    thread/qthreadstorage.h \
+    thread/qwaitcondition.h
 
-# private headers
-HEADERS += thread/qmutex_p.h \
-           thread/qmutexpool_p.h \
-           thread/qfutex_p.h \
-           thread/qorderedmutexlocker_p.h \
-           thread/qreadwritelock_p.h \
-           thread/qthread_p.h \
-           thread/qthreadpool_p.h
+SOURCES += \
+    thread/qrunnable.cpp \
+    thread/qthread.cpp
 
-SOURCES += thread/qatomic.cpp \
-           thread/qmutex.cpp \
-           thread/qreadwritelock.cpp \
-           thread/qrunnable.cpp \
-           thread/qmutexpool.cpp \
-           thread/qsemaphore.cpp \
-           thread/qthread.cpp \
-           thread/qthreadpool.cpp \
-           thread/qthreadstorage.cpp
+win32 {
+    HEADERS += thread/qatomic_msvc.h
+
+    SOURCES += thread/qthread_win.cpp
+} else {
+    SOURCES += thread/qthread_unix.cpp
+}
+
+qtConfig(thread) {
+    HEADERS += \
+        thread/qatomic.h \
+        thread/qatomic_bootstrap.h \
+        thread/qatomic_cxx11.h \
+        thread/qbasicatomic.h \
+        thread/qfutex_p.h \
+        thread/qgenericatomic.h \
+        thread/qmutexpool_p.h \
+        thread/qmutex_p.h \
+        thread/qorderedmutexlocker_p.h \
+        thread/qreadwritelock_p.h \
+        thread/qsemaphore.h \
+        thread/qthreadpool.h \
+        thread/qthreadpool_p.h \
+        thread/qthread_p.h
+
+    SOURCES += \
+       thread/qatomic.cpp \
+       thread/qmutex.cpp \
+       thread/qmutexpool.cpp \
+       thread/qreadwritelock.cpp \
+       thread/qsemaphore.cpp \
+       thread/qthreadpool.cpp \
+       thread/qthreadstorage.cpp
+
+    win32 {
+        SOURCES += \
+            thread/qmutex_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/qwaitcondition_unix.cpp
+    }
+}
 
 qtConfig(future) {
     HEADERS += \
@@ -52,24 +80,4 @@ qtConfig(future) {
         thread/qresultstore.cpp
 }
 
-win32 {
-    HEADERS += thread/qatomic_msvc.h
-
-    SOURCES += \
-        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
-}
-
 qtConfig(std-atomic64): QMAKE_USE += libatomic