aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMÃ¥rten Nordheim <marten.nordheim@qt.io>2022-03-31 09:21:23 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-31 08:56:50 +0000
commit0cc3c72dc2e40716bb6db9e011f21324c185faff (patch)
tree4c457a2b4cb9a73680347c4225d494f80786325b
parent2db96ed122eb63769dd1431e8e1d89fd3ddfe0f0 (diff)
tst_QWebSocket: fix scope of ifdef proxy-check
Because other tests had made their way inside Change-Id: Ie6fa545a84c2f66e0c2617f498118a3e04eedd0c Reviewed-by: Arno Rehn <a.rehn@menlosystems.com> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit ebf82dc805354e8d9b1c2f0a45bad6594dbbbd22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
index 329419c..7a27ad3 100644
--- a/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
+++ b/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp
@@ -779,6 +779,7 @@ void tst_QWebSocket::tst_setProxy()
socket.setProxy(proxy);
QCOMPARE(socket.proxy(), proxy);
}
+#endif // QT_NO_NETWORKPROXY
void tst_QWebSocket::overlongCloseReason()
{
@@ -881,8 +882,6 @@ void tst_QWebSocket::testingFrameAndMessageSizeApi()
QTRY_COMPARE(maxAllowedIncomingMessageSize, socket.maxAllowedIncomingMessageSize());
}
-#endif // QT_NO_NETWORKPROXY
-
QTEST_MAIN(tst_QWebSocket)
#include "tst_qwebsocket.moc"