Commit 4ccbf920 authored by Maurice Kalinowski's avatar Maurice Kalinowski Committed by Oswald Buddenhagen
Browse files

Compile fix without proxy support


This is required for for the autotests to compile.

Change-Id: I8cd1ad11ca5d28e2d1ade06649cf6c2e1eee9a2c
Reviewed-by: default avatarOliver Wolff <oliver.wolff@digia.com>
(cherry picked from commit aef4cba4)
Showing with 4 additions and 0 deletions
...@@ -147,7 +147,9 @@ private Q_SLOTS: ...@@ -147,7 +147,9 @@ private Q_SLOTS:
void tst_sendTextMessage(); void tst_sendTextMessage();
void tst_sendBinaryMessage(); void tst_sendBinaryMessage();
void tst_errorString(); void tst_errorString();
#ifndef QT_NO_NETWORKPROXY
void tst_setProxy(); void tst_setProxy();
#endif
}; };
tst_QWebSocket::tst_QWebSocket() tst_QWebSocket::tst_QWebSocket()
...@@ -576,6 +578,7 @@ void tst_QWebSocket::tst_errorString() ...@@ -576,6 +578,7 @@ void tst_QWebSocket::tst_errorString()
QCOMPARE(socket.errorString(), QStringLiteral("Host not found")); QCOMPARE(socket.errorString(), QStringLiteral("Host not found"));
} }
#ifndef QT_NO_NETWORKPROXY
void tst_QWebSocket::tst_setProxy() void tst_QWebSocket::tst_setProxy()
{ {
// check if property assignment works as expected. // check if property assignment works as expected.
...@@ -592,6 +595,7 @@ void tst_QWebSocket::tst_setProxy() ...@@ -592,6 +595,7 @@ void tst_QWebSocket::tst_setProxy()
socket.setProxy(proxy); socket.setProxy(proxy);
QCOMPARE(socket.proxy(), proxy); QCOMPARE(socket.proxy(), proxy);
} }
#endif // QT_NO_NETWORKPROXY
QTEST_MAIN(tst_QWebSocket) QTEST_MAIN(tst_QWebSocket)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment