From 0a06e1baf9e6da5308582b9dc928f4d9fea508d0 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 29 Dec 2016 17:11:24 +0100 Subject: 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 --- src/network/configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/network/configure.json') diff --git a/src/network/configure.json b/src/network/configure.json index 0215ad73c5..32fcfb499f 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -263,6 +263,7 @@ "label": "HTTP", "purpose": "Provides support for the Hypertext Transfer Protocol in QNetworkAccessManager.", "section": "Networking", + "condition": "features.thread", "output": [ "publicFeature", "feature" ] }, "udpsocket": { @@ -301,7 +302,7 @@ "label": "Bearer management", "purpose": "Provides bearer management for the network stack.", "section": "Networking", - "condition": "features.library && features.networkinterface && features.properties", + "condition": "features.thread && features.library && features.networkinterface && features.properties", "output": [ "publicFeature", "feature" ] }, "localserver": { -- cgit v1.2.3