From aef4cba4ce5f3acfa6765c71283d9363dffe97b7 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 7 Jul 2014 13:19:50 +0200 Subject: [PATCH 1/1] Compile fix without proxy support Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff --- tests/auto/qwebsocket/tst_qwebsocket.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/auto/qwebsocket/tst_qwebsocket.cpp b/tests/auto/qwebsocket/tst_qwebsocket.cpp index 529efa3..f5dc080 100644 --- a/tests/auto/qwebsocket/tst_qwebsocket.cpp +++ b/tests/auto/qwebsocket/tst_qwebsocket.cpp @@ -147,7 +147,9 @@ private Q_SLOTS: void tst_sendTextMessage(); void tst_sendBinaryMessage(); void tst_errorString(); +#ifndef QT_NO_NETWORKPROXY void tst_setProxy(); +#endif }; tst_QWebSocket::tst_QWebSocket() @@ -576,6 +578,7 @@ void tst_QWebSocket::tst_errorString() QCOMPARE(socket.errorString(), QStringLiteral("Host not found")); } +#ifndef QT_NO_NETWORKPROXY void tst_QWebSocket::tst_setProxy() { // check if property assignment works as expected. @@ -592,6 +595,7 @@ void tst_QWebSocket::tst_setProxy() socket.setProxy(proxy); QCOMPARE(socket.proxy(), proxy); } +#endif // QT_NO_NETWORKPROXY QTEST_MAIN(tst_QWebSocket) -- 2.7.4