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/kernel | |
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/kernel')
-rw-r--r-- | src/network/kernel/qnetconmonitor_darwin.mm | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/network/kernel/qnetconmonitor_darwin.mm b/src/network/kernel/qnetconmonitor_darwin.mm index 322c87cb4b..a64cd6e530 100644 --- a/src/network/kernel/qnetconmonitor_darwin.mm +++ b/src/network/kernel/qnetconmonitor_darwin.mm @@ -48,7 +48,6 @@ #include <netinet/in.h> #include <cstring> -#include <mutex> QT_BEGIN_NAMESPACE @@ -309,20 +308,8 @@ public: bool isOnlineIpv4 = false; QNetworkConnectionMonitor ipv6Probe; bool isOnlineIpv6 = false; - - static bool enabled; - static void readEnv(); }; -bool QNetworkStatusMonitorPrivate::enabled = false; - -void QNetworkStatusMonitorPrivate::readEnv() -{ - bool envOk = false; - const int env = qEnvironmentVariableIntValue("QT_USE_NETWORK_MONITOR", &envOk); - enabled = envOk && env > 0; -} - QNetworkStatusMonitor::QNetworkStatusMonitor() : QObject(*new QNetworkStatusMonitorPrivate) { @@ -400,9 +387,7 @@ bool QNetworkStatusMonitor::isNetworkAccesible() bool QNetworkStatusMonitor::isEnabled() { - static std::once_flag envRead = {}; - std::call_once(envRead, QNetworkStatusMonitorPrivate::readEnv); - return QNetworkStatusMonitorPrivate::enabled; + return true; } void QNetworkStatusMonitor::reachabilityChanged(bool online) |