summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qthreadstorage.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2016-12-29 17:11:24 +0100
committerLorn Potter <lorn.potter@gmail.com>2018-08-17 00:34:36 +0000
commit0a06e1baf9e6da5308582b9dc928f4d9fea508d0 (patch)
tree187be725390515db55f56e5f2cdebad60ee183f8 /src/corelib/thread/qthreadstorage.h
parent815153d4a453855bb528f0fa9cb7e5a77d589a11 (diff)
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>
Diffstat (limited to 'src/corelib/thread/qthreadstorage.h')
-rw-r--r--src/corelib/thread/qthreadstorage.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h
index 9a91883de8..d556e33c57 100644
--- a/src/corelib/thread/qthreadstorage.h
+++ b/src/corelib/thread/qthreadstorage.h
@@ -42,7 +42,7 @@
#include <QtCore/qglobal.h>
-#ifndef QT_NO_THREAD
+#if QT_CONFIG(thread)
QT_BEGIN_NAMESPACE
@@ -152,7 +152,7 @@ public:
QT_END_NAMESPACE
-#else // !QT_NO_THREAD
+#else // !QT_CONFIG(thread)
#include <qscopedpointer.h>
@@ -227,6 +227,6 @@ public:
}
};
-#endif // QT_NO_THREAD
+#endif // QT_CONFIG(thread)
#endif // QTHREADSTORAGE_H