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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 |
1 files changed, 1 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 |