summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@digia.com>2014-07-07 13:19:50 +0200
committerMaurice Kalinowski <maurice.kalinowski@digia.com>2014-07-07 13:52:19 +0200
commitaef4cba4ce5f3acfa6765c71283d9363dffe97b7 (patch)
tree0b8b8a3b59f1121d7d9d11d9f6ff90b5ff503e9b /tests/auto
parent5595f6bf78bd63fabca27d263ce15f7b5b93fd64 (diff)
downloadqtwebsockets-aef4cba4ce5f3acfa6765c71283d9363dffe97b7.tar.gz
Compile fix without proxy support
Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qwebsocket/tst_qwebsocket.cpp4
1 files changed, 4 insertions, 0 deletions
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)