diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-12-19 14:30:59 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-12-20 11:50:07 +0000 |
| commit | 33a72ee6f3ed85c3d5f694c2a3ab90b1f50786ea (patch) | |
| tree | 4895456906851ee19ce1df59061bd6bd031f0dba /src/network/ssl/qsslsocket_winrt.cpp | |
| parent | 17d231039b53c03e67d025f1f72bbd529e98fcbd (diff) | |
winrt: Register ssl socket upgrade callback in Xaml thread
Task-number: QTBUG-65354
Change-Id: If628c73b05854c13086708c193995062c8b9f9e4
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket_winrt.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_winrt.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp index ca65f8a015..762b393738 100644 --- a/src/network/ssl/qsslsocket_winrt.cpp +++ b/src/network/ssl/qsslsocket_winrt.cpp @@ -47,6 +47,7 @@ #include <QtCore/QSysInfo> #include <QtCore/qfunctions_winrt.h> #include <private/qnativesocketengine_winrt_p.h> +#include <private/qeventdispatcher_winrt_p.h> #include <windows.networking.h> #include <windows.networking.sockets.h> @@ -443,8 +444,11 @@ void QSslSocketBackendPrivate::continueHandshake() return; } - hr = op->put_Completed(Callback<IAsyncActionCompletedHandler>( - this, &QSslSocketBackendPrivate::onSslUpgrade).Get()); + hr = QEventDispatcherWinRT::runOnXamlThread([this, op]() { + HRESULT hr = op->put_Completed(Callback<IAsyncActionCompletedHandler>( + this, &QSslSocketBackendPrivate::onSslUpgrade).Get()); + return hr; + }); Q_ASSERT_SUCCEEDED(hr); } |