diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-12-29 17:11:24 +0100 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-08-17 00:34:36 +0000 |
| commit | 0a06e1baf9e6da5308582b9dc928f4d9fea508d0 (patch) | |
| tree | 187be725390515db55f56e5f2cdebad60ee183f8 /configure.json | |
| parent | 815153d4a453855bb528f0fa9cb7e5a77d589a11 (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 'configure.json')
| -rw-r--r-- | configure.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.json b/configure.json index ae5f71291c..16a2af5bab 100644 --- a/configure.json +++ b/configure.json @@ -1106,10 +1106,17 @@ "condition": "libs.zlib", "output": [ "privateFeature" ] }, + "thread": { + "label": "Thread support", + "purpose": "Provides QThread and related classes.", + "section": "Kernel", + "output": [ "publicFeature" ] + }, "future": { "label": "QFuture", "purpose": "Provides QFuture and related classes.", "section": "Kernel", + "condition": "features.thread", "output": [ "publicFeature" ] }, "concurrent": { @@ -1122,6 +1129,7 @@ "dbus": { "label": "Qt D-Bus", "autoDetect": "!config.uikit && !config.android && !config.winrt", + "condition": "features.thread", "output": [ "privateFeature", "feature" ] }, "dbus-linked": { @@ -1153,10 +1161,12 @@ }, "network": { "label": "Qt Network", + "condition": "features.thread", "output": [ "privateFeature" ] }, "sql": { "label": "Qt Sql", + "condition": "features.thread", "output": [ "privateFeature" ] }, "testlib": { |