summaryrefslogtreecommitdiffstats
path: root/src/network/socket/qabstractsocket.cpp
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@qt.io>2016-11-04 13:46:36 +0100
committerMaurice Kalinowski <maurice.kalinowski@qt.io>2016-11-23 09:27:45 +0000
commite9fa435652ef064515bd5c04c0b5e5c4a30ebca4 (patch)
tree3658f0fadfce68732bca17b69cbff4dd3ea512f4 /src/network/socket/qabstractsocket.cpp
parent20017d0b1bde34190d96bebe34b4e641efdde779 (diff)
winrt: Add support for Windows Information Protection
Windows Information Protection is used for splitting corporate and personal data, requiring connections to be established in a different way instantiating ThreadNetworkContext. Usage is enabled via the QT_WINRT_USE_THREAD_NETWORK_CONTEXT environment variable. Change-Id: I3aaa097b66fc616d42cd05a1e20bbcb004f6e467 Reviewed-by: James Tong Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
-rw-r--r--src/network/socket/qabstractsocket.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 02bba2d293..57c40194a3 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1113,10 +1113,15 @@ void QAbstractSocketPrivate::_q_connectToNextAddress()
// Tries to connect to the address. If it succeeds immediately
// (localhost address on BSD or any UDP connect), emit
// connected() and return.
- if (socketEngine->connectToHost(host, port)) {
- //_q_testConnection();
- fetchConnectionParameters();
- return;
+ if (
+#if defined(Q_OS_WINRT) && _MSC_VER >= 1900
+ !qEnvironmentVariableIsEmpty("QT_WINRT_USE_THREAD_NETWORK_CONTEXT") ?
+ socketEngine->connectToHostByName(hostName, port) :
+#endif
+ socketEngine->connectToHost(host, port)) {
+ //_q_testConnection();
+ fetchConnectionParameters();
+ return;
}
// Check that we're in delayed connection state. If not, try