diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
| commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
| tree | 363dfd46575d147206267d854ce14747157f432e /tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | |
| parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) | |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp')
| -rw-r--r-- | tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp index 88d2c46f3d..3c4728afec 100644 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp @@ -126,9 +126,7 @@ private slots: void bindThenResolveHost_data(); void bindThenResolveHost(); void setInvalidSocketDescriptor(); -#ifndef Q_OS_WINRT void setSocketDescriptor(); -#endif void socketDescriptor(); void blockingIMAP(); void nonBlockingIMAP(); @@ -738,7 +736,6 @@ void tst_QTcpSocket::setInvalidSocketDescriptor() //---------------------------------------------------------------------------------- -#ifndef Q_OS_WINRT void tst_QTcpSocket::setSocketDescriptor() { QFETCH_GLOBAL(bool, setProxy); @@ -782,7 +779,6 @@ void tst_QTcpSocket::setSocketDescriptor() delete dummy; #endif } -#endif // !Q_OS_WINRT //---------------------------------------------------------------------------------- |