Merge remote-tracking branch 'origin/5.6.1' into 5.6

Conflicts:
	src/network/socket/qnativesocketengine_winrt.cpp

Change-Id: I8edb72f8ba958d80c3d7993b3feaaae782ca8d9c

1 files changed, 16 insertions, 14 deletions

diff --git a/src/network/socket/qnativesocketengine_winrt.cpp b/src/network/socket/qnativesocketengine_winrt.cpp
index d79dffa215..1c63e97ee8 100644
--- a/src/network/socket/qnativesocketengine_winrt.cpp
+++ b/src/network/socket/qnativesocketengine_winrt.cpp
@@ -458,22 +458,24 @@ void QNativeSocketEngine::close()
     }
 
 #if _MSC_VER >= 1900
-    hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
-        HRESULT hr;
-        // To close the connection properly (not with a hard reset) all pending read operation have to
-        // be finished or cancelled. The API isn't available on Windows 8.1 though.
-        ComPtr<IStreamSocket3> socket3;
-        hr = d->tcpSocket()->QueryInterface(IID_PPV_ARGS(&socket3));
-        Q_ASSERT_SUCCEEDED(hr);
+    if (d->socketType == QAbstractSocket::TcpSocket) {
+        hr = QEventDispatcherWinRT::runOnXamlThread([d]() {
+            HRESULT hr;
+            // To close the connection properly (not with a hard reset) all pending read operation have to
+            // be finished or cancelled. The API isn't available on Windows 8.1 though.
+            ComPtr<IStreamSocket3> socket3;
+            hr = d->tcpSocket()->QueryInterface(IID_PPV_ARGS(&socket3));
+            Q_ASSERT_SUCCEEDED(hr);
 
-        ComPtr<IAsyncAction> action;
-        hr = socket3->CancelIOAsync(&action);
-        Q_ASSERT_SUCCEEDED(hr);
-        hr = QWinRTFunctions::await(action);
+            ComPtr<IAsyncAction> action;
+            hr = socket3->CancelIOAsync(&action);
+            Q_ASSERT_SUCCEEDED(hr);
+            hr = QWinRTFunctions::await(action);
+            Q_ASSERT_SUCCEEDED(hr);
+            return S_OK;
+        });
         Q_ASSERT_SUCCEEDED(hr);
-        return S_OK;
-    });
-    Q_ASSERT_SUCCEEDED(hr);
+    }
 #endif // _MSC_VER >= 1900
 
     if (d->readOp) {