Merge remote-tracking branch 'origin/5.3' into dev

[contrib/qtwebsockets.git] / src / websockets / qwebsocket_p.cpp

diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 385ae71..a334db1 100644 (file)
--- 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