diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-17 13:23:47 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-24 08:37:38 +0000 |
| commit | 72ed34b792f5acca5e0ada3b3d753b7a16274ff6 (patch) | |
| tree | ccf27ceb90d95bef9d9f429edaa9e2127f68e638 /src/network | |
| parent | 34be7dc9d09c45a5e47a13716ee4db70f95dabcf (diff) | |
Don't set platform specific QT_NO_FOO defines in qglobal.h
They should be enabled/disabled through the configuration system.
Remove some unused defines, and move one define from qglobal.h to
a proper feature definition in Qt Gui.
Change-Id: Ie8d5bff9712ba745af60b42ceca3f0440bed2706
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/configure.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index 30a1c39c0c..1e08aa7c49 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -207,12 +207,14 @@ "label": "QNetworkProxy", "purpose": "Provides network proxy support.", "section": "Networking", + "condition": "!config.winrt", "output": [ "publicFeature", "feature" ] }, "socks5": { "label": "SOCKS5", "purpose": "Provides SOCKS5 support in QNetworkProxy.", "section": "Networking", + "condition": "!config.winrt", "output": [ "publicFeature", "feature" ] }, "networkinterface": { |