summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJędrzej Nowacki <jedrzej.nowacki@digia.com>2014-06-24 14:32:33 +0200
committerJędrzej Nowacki <jedrzej.nowacki@digia.com>2014-06-25 10:40:27 +0200
commit00f77bdc5beb62e980216cfee906ab7aa1d1c4f7 (patch)
tree26367f36a9e708c8092f14a152575da35e4bc64a /src
parentb74e437051deb629a9ec3887678db76727fd0729 (diff)
downloadqtwebsockets-00f77bdc5beb62e980216cfee906ab7aa1d1c4f7.tar.gz
Fix a typo in proxy handling.
Change-Id: I25c9b9be2c780dae32e3f634f58e44be303a4b23 Task-number: QTBUG-39568 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/websockets/qwebsocket_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 18962ff..1932aeb 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -1227,7 +1227,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