summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2017-06-15 14:39:39 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-06-24 17:18:37 +0000
commitd9206926d88b779495cc32c3cfec6bcc53021546 (patch)
tree2956484a2220fe10a736a19fa2f83001027d0874 /src/network
parentf5d178976a2d964b276a83a76df15464a4cd927d (diff)
winrt: Enable network proxy support
[ChangeLog][QtNetwork][QNetworkProxy] Setting of network proxies is now supported on UWP. Task-number: QTBUG-45495 Change-Id: I71fed57910197760334f8e7d2aeac36c4e0d4f51 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/configure.json1
-rw-r--r--src/network/kernel/kernel.pri2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/network/configure.json b/src/network/configure.json
index d35dda99bc..efb48f7655 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -205,7 +205,6 @@
"label": "QNetworkProxy",
"purpose": "Provides network proxy support.",
"section": "Networking",
- "condition": "!config.winrt",
"output": [ "publicFeature", "feature" ]
},
"socks5": {
diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri
index a80b2d387e..c3fcf25233 100644
--- a/src/network/kernel/kernel.pri
+++ b/src/network/kernel/kernel.pri
@@ -60,7 +60,7 @@ mac {
}
osx:SOURCES += kernel/qnetworkproxy_mac.cpp
-else:win32:SOURCES += kernel/qnetworkproxy_win.cpp
+else:win32:!winrt: SOURCES += kernel/qnetworkproxy_win.cpp
else: qtConfig(libproxy) {
SOURCES += kernel/qnetworkproxy_libproxy.cpp
QMAKE_USE_PRIVATE += libproxy