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/qtcpserver | |
| 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/qtcpserver')
| -rw-r--r-- | tests/auto/network/socket/qtcpserver/crashingServer/main.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp index 5c66ef6520..7cb65cd1a3 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp +++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp @@ -29,14 +29,14 @@ #include <QtCore> #include <QtNetwork> -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC) +#if defined(Q_OS_WIN) && defined(Q_CC_MSVC) # include <crtdbg.h> #endif int main(int argc, char *argv[]) { // Windows: Suppress crash notification dialog. -#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) && defined(Q_CC_MSVC) +#if defined(Q_OS_WIN) && defined(Q_CC_MSVC) _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); #endif QCoreApplication app(argc, argv); diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 094e28149c..927dc5cf9a 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -88,9 +88,7 @@ private slots: void maxPendingConnections(); void listenError(); void waitForConnectionTest(); -#ifndef Q_OS_WINRT void setSocketDescriptor(); -#endif void listenWhileListening(); void addressReusable(); void setNewSocketDescriptorBlocking(); @@ -527,7 +525,6 @@ void tst_QTcpServer::waitForConnectionTest() } //---------------------------------------------------------------------------------- -#ifndef Q_OS_WINRT void tst_QTcpServer::setSocketDescriptor() { QTcpServer server; @@ -557,7 +554,6 @@ void tst_QTcpServer::setSocketDescriptor() WSACleanup(); #endif } -#endif // !Q_OS_WINRT //---------------------------------------------------------------------------------- void tst_QTcpServer::listenWhileListening() @@ -579,7 +575,6 @@ public: bool ok; protected: -#ifndef Q_OS_WINRT void incomingConnection(qintptr socketDescriptor) { // how a user woulddo it (qabstractsocketengine is not public) @@ -592,7 +587,6 @@ protected: ::close(socketDescriptor); #endif } -#endif // !Q_OS_WINRT }; void tst_QTcpServer::addressReusable() |