diff options
| author | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-07-07 13:19:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-11-03 11:38:44 +0100 |
| commit | 4ccbf920d63ae1bf52b8a3bf6c795822172acc24 (patch) | |
| tree | d45b67e4be3f9000ab384400b797e4d8eb702459 | |
| parent | c98ca1256d40a59612b31c78c3e4f2f01e1b861f (diff) | |
| download | qtwebsockets-4ccbf920d63ae1bf52b8a3bf6c795822172acc24.tar.gz | |
Compile fix without proxy support
This is required for for the autotests to compile.
Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
(cherry picked from commit aef4cba4ce5f3acfa6765c71283d9363dffe97b7)
| -rw-r--r-- | tests/auto/qwebsocket/tst_qwebsocket.cpp | 4 |
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) |