summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2019-07-03 16:24:35 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2019-07-08 10:12:33 +0000
commit011c22116590ffed105e6630d8bc4b802d80484d (patch)
treed578f5588f50baece5879e5737844b903cf0bf2b /src/network/access
parentb41c9a89969796407b03fd9c5cde1d77999841c1 (diff)
QNAM: Don't condition connecting QNetworkReplyImpl signals on qnetconmon
QNetwork{Status,Connection}Monitor isn't used for QNetworkReplyImpl yet, so we should connect the signal until it is. Change-Id: I40f1483608195418d43c442f46184882f64596ff Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index a2996e3533..548cfe6593 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -1565,8 +1565,8 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera
QNetworkReplyImpl *reply = new QNetworkReplyImpl(this);
#ifndef QT_NO_BEARERMANAGEMENT
// NETMONTODO: network reply impl must be augmented to use the same monitoring
- // capabilities as http network reply impl does.
- if (!isLocalFile && !d->statusMonitor.isEnabled()) {
+ // capabilities as http network reply impl does. Once it does: uncomment the condition below
+ if (!isLocalFile /*&& !d->statusMonitor.isEnabled()*/) {
connect(this, SIGNAL(networkSessionConnected()),
reply, SLOT(_q_networkSessionConnected()));
}