From 88b33d3830e5d9e8dcfde260d3ac9bec5c11fc58 Mon Sep 17 00:00:00 2001
From: Philip <philm@manjaro.org>
Date: Fri, 3 Feb 2017 20:08:53 +0100
Subject: [PATCH] [welcome] revert 56b21bb

---
 .../welcome/checker/RequirementsChecker.cpp   | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/modules/welcome/checker/RequirementsChecker.cpp b/src/modules/welcome/checker/RequirementsChecker.cpp
index 6bfc31ab7..3d7eb7da7 100644
--- a/src/modules/welcome/checker/RequirementsChecker.cpp
+++ b/src/modules/welcome/checker/RequirementsChecker.cpp
@@ -36,9 +36,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QLabel>
-#include <QNetworkConfigurationManager>
-#include <QNetworkConfiguration>
-
+#include <QNetworkAccessManager>
 #include <QProcess>
 #include <QTimer>
 
@@ -339,20 +337,8 @@ RequirementsChecker::checkHasPower()
 bool
 RequirementsChecker::checkHasInternet()
 {
-    // doc from: https://doc.qt.io/qt-5/qnetworkconfigurationmanager.html#isOnline
-    bool hasInternet = false;
-
-    QNetworkConfigurationManager mgr;
-    QList<QNetworkConfiguration> activeConfigs = mgr.allConfigurations(QNetworkConfiguration::Active);
-
-    if (activeConfigs.count() > 0) {
-        Q_ASSERT(mgr.isOnline());
-        hasInternet = mgr.isOnline();
-    }
-    else {
-        Q_ASSERT(!mgr.isOnline());
-    }
-
+    // default to true in the QNetworkAccessManager::UnknownAccessibility case
+    bool hasInternet = QNetworkAccessManager(this).networkAccessible() != QNetworkAccessManager::NotAccessible;
     Calamares::JobQueue::instance()->globalStorage()->insert( "hasInternet", hasInternet );
     return hasInternet;
 }