diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-05-06 14:29:11 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-05-10 10:45:43 +0000 |
| commit | 8ac77123e287b13063a68ba2d48e0cc5cb24616d (patch) | |
| tree | 5ce63e561759db39d2eb1b5000235d726f454176 /src/network/access | |
| parent | 681bd76e671939b6717f1a35ec9b8383f48fb294 (diff) | |
QNetworkStatusMonitor - make it always enabled on Darwin
Also undo changes in setNetworkAccessible and setConfiguration
since they introduced a change in behavior, which results
in auto-test failing.
Change-Id: I5d74c47338bff8f964ba2e27256902c79303e00f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 8bd630ad9d..d201b9e211 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1039,13 +1039,10 @@ QNetworkReply *QNetworkAccessManager::deleteResource(const QNetworkRequest &requ void QNetworkAccessManager::setConfiguration(const QNetworkConfiguration &config) { Q_D(QNetworkAccessManager); - if (!d->statusMonitor.isEnabled()) { - d->networkConfiguration = config; - d->customNetworkConfiguration = true; - d->createSession(config); - } else { - qWarning(lcNetMon, "No network configuration can be set with network status monitor enabled"); - } + + d->networkConfiguration = config; + d->customNetworkConfiguration = true; + d->createSession(config); } /*! @@ -1107,11 +1104,6 @@ void QNetworkAccessManager::setNetworkAccessible(QNetworkAccessManager::NetworkA { Q_D(QNetworkAccessManager); - if (d->statusMonitor.isEnabled()) { - qWarning(lcNetMon, "Can not manually set network accessibility with the network status monitor enabled"); - return; - } - d->defaultAccessControl = accessible == NotAccessible ? false : true; if (d->networkAccessible != accessible) { |