diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-27 09:46:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-27 09:46:33 +0000 |
| commit | b159a1c3e0d715057e461e5e2707f3845e31b2e9 (patch) | |
| tree | 0f266f436b7c34bdb9eb3115730af70c0b0d819e /src/network/access | |
| parent | 01d526d18b271281b4f21d7c379e93f8def069c2 (diff) | |
| parent | 23a36fd2bfcdb57849deaa1e10e6e3f7b1156ed8 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkreplyimpl.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 935c17dfc1..c6173791a6 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1956,7 +1956,7 @@ void QNetworkReplyHttpImplPrivate::_q_networkSessionConnected() void QNetworkReplyHttpImplPrivate::_q_networkSessionStateChanged(QNetworkSession::State sessionState) { if (sessionState == QNetworkSession::Disconnected - && (state != Idle || state != Reconnecting)) { + && state != Idle && state != Reconnecting) { error(QNetworkReplyImpl::NetworkSessionFailedError, QCoreApplication::translate("QNetworkReply", "Network session error.")); finished(); diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index 59a0cd8ddc..d69d5983cb 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -325,7 +325,7 @@ void QNetworkReplyImplPrivate::_q_networkSessionConnected() void QNetworkReplyImplPrivate::_q_networkSessionStateChanged(QNetworkSession::State sessionState) { if (sessionState == QNetworkSession::Disconnected - && (state != Idle || state != Reconnecting)) { + && state != Idle && state != Reconnecting) { error(QNetworkReplyImpl::NetworkSessionFailedError, QCoreApplication::translate("QNetworkReply", "Network session error.")); finished(); |