diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:29:10 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:29:10 +0200 |
| commit | 3f99082f3bb81982e0c6777875fb5c2a1d9033df (patch) | |
| tree | bae72f2e8723cf52c8dd0cffb016a1e2a5c69312 | |
| parent | 717ba7e69a1c16f8d4b26984a63b3c0450b131bf (diff) | |
| parent | 00f77bdc5beb62e980216cfee906ab7aa1d1c4f7 (diff) | |
| download | qtwebsockets-3f99082f3bb81982e0c6777875fb5c2a1d9033df.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qwebsocket/tst_qwebsocket.cpp | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 385ae71..a334db1 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1252,7 +1252,7 @@ QNetworkProxy QWebSocketPrivate::proxy() const */ void QWebSocketPrivate::setProxy(const QNetworkProxy &networkProxy) { - if (networkProxy != networkProxy) + if (m_configuration.m_proxy != networkProxy) m_configuration.m_proxy = networkProxy; } #endif //QT_NO_NETWORKPROXY diff --git a/tests/auto/qwebsocket/tst_qwebsocket.cpp b/tests/auto/qwebsocket/tst_qwebsocket.cpp index 9e5997e..529efa3 100644 --- a/tests/auto/qwebsocket/tst_qwebsocket.cpp +++ b/tests/auto/qwebsocket/tst_qwebsocket.cpp @@ -147,6 +147,7 @@ private Q_SLOTS: void tst_sendTextMessage(); void tst_sendBinaryMessage(); void tst_errorString(); + void tst_setProxy(); }; tst_QWebSocket::tst_QWebSocket() @@ -575,6 +576,23 @@ void tst_QWebSocket::tst_errorString() QCOMPARE(socket.errorString(), QStringLiteral("Host not found")); } +void tst_QWebSocket::tst_setProxy() +{ + // check if property assignment works as expected. + QWebSocket socket; + QCOMPARE(socket.proxy(), QNetworkProxy(QNetworkProxy::DefaultProxy)); + + QNetworkProxy proxy; + proxy.setPort(123); + socket.setProxy(proxy); + QCOMPARE(socket.proxy(), proxy); + + proxy.setPort(321); + QCOMPARE(socket.proxy().port(), quint16(123)); + socket.setProxy(proxy); + QCOMPARE(socket.proxy(), proxy); +} + QTEST_MAIN(tst_QWebSocket) #include "tst_qwebsocket.moc" |