diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:36:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-13 09:39:20 +0100 |
| commit | 6755ec891a1740110c48895afd53d39e8370704a (patch) | |
| tree | 982606f3bc582262e4b315a63f55ccb141fff97b /src/network/socket/qabstractsocket.cpp | |
| parent | 449204f8c0d6679ae0e58dbb8a30b8a86fbdb4ec (diff) | |
| parent | 00c9ec63a552d040e851b561c11428fabf1a2b08 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
qmake/Makefile.unix.macos
qmake/Makefile.unix.win32
qmake/generators/win32/msvc_vcproj.cpp
src/3rdparty/pcre/qt_attribution.json
src/corelib/io/qsettings.cpp
src/corelib/kernel/qdeadlinetimer.cpp
src/platformsupport/kmsconvenience/qkmsdevice.cpp
src/platformsupport/kmsconvenience/qkmsdevice_p.h
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h
tests/manual/qstorageinfo/printvolumes.cpp
tools/configure/configureapp.cpp
Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 6b773e2be9..271b5848c5 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1112,10 +1112,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 |