7 files changed, 35 insertions, 29 deletions
diff --git a/src/imports/wifi/pluginmain.cpp b/src/imports/wifi/pluginmain.cpp
index 0eeff78..3c560f9 100644
--- a/src/imports/wifi/pluginmain.cpp
+++ b/src/imports/wifi/pluginmain.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
@@ -18,11 +18,12 @@
 ****************************************************************************/
 #include "qwifimanager.h"
 
+#include <QtCore/QDir>
+#include <QtCore/QByteArray>
 #include <QtQml/QQmlExtensionPlugin>
 #include <QtQml/qqml.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QByteArray>
+#include <hardware_legacy/wifi.h>
 
 class QWifiGlobal : public QObject
 {
@@ -34,15 +35,20 @@ public:
 
     Q_INVOKABLE bool wifiSupported() const
     {
-        char interface[PROPERTY_VALUE_MAX];
-        property_get("wifi.interface", interface, NULL);
-        // standard linux kernel path
-        QByteArray path;
-        path.append("/sys/class/net/").append(interface);
-        bool interfaceFound = QDir().exists(path.constData());
-        if (!interfaceFound)
-            qWarning() << "QWifiGlobal: could not find wifi interface in " << path;
-        return interfaceFound;
+        bool supported = false;
+        if (wifi_load_driver() == 0 && wifi_start_supplicant(0) == 0) {
+            char interface[PROPERTY_VALUE_MAX];
+            property_get("wifi.interface", interface, NULL);
+            // standard linux kernel path
+            QByteArray path;
+            path.append("/sys/class/net/").append(interface);
+            supported = QDir().exists(path.constData());
+            if (!supported)
+                qWarning() << "QWifiGlobal: could not find wifi interface in " << path;
+        } else {
+            qWarning() << "QWifiGlobal: wifi driver is not available";
+        }
+        return supported;
     }
 };
 
diff --git a/src/imports/wifi/qwifimanager.cpp b/src/imports/wifi/qwifimanager.cpp
index 9139242..7d6683b 100644
--- a/src/imports/wifi/qwifimanager.cpp
+++ b/src/imports/wifi/qwifimanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
@@ -142,19 +142,19 @@ QWifiManager::QWifiManager()
     } else {
         qWarning() << "QWifiManager: failed to connect to qconnectivity socket";
     }
-
     // check if backend has already been initialized
     char backend_status[PROPERTY_VALUE_MAX];
-    if (property_get(QT_WIFI_BACKEND, backend_status, NULL)
-            && strcmp(backend_status, "running") == 0) {
-        // let it re-connect, in most cases this will see that everything is working properly
-        // and will do nothing. Special case is when process has crashed or was killed by a system
-        // signal in previous execution, which results in broken connection to a supplicant,
-        // connectToBackend will fix it..
-        connectToBackend();
-    } else {
-        // same here, cleans up the state
-        disconnectFromBackend();
+    if (property_get(QT_WIFI_BACKEND, backend_status, NULL)) {
+        if (strcmp(backend_status, "running") == 0) {
+            // let it re-connect, in most cases this will see that everything is working properly
+            // and will do nothing. Special case is when process has crashed or was killed by a system
+            // signal in previous execution, which results in broken connection to a supplicant,
+            // connectToBackend will fix it..
+            connectToBackend();
+        } else if (strcmp(backend_status, "stopped") == 0) {
+            // same here, cleans up the state
+            disconnectFromBackend();
+        }
     }
 }
 
diff --git a/src/imports/wifi/qwifimanager.h b/src/imports/wifi/qwifimanager.h
index c9ba2ef..432f411 100644
--- a/src/imports/wifi/qwifimanager.h
+++ b/src/imports/wifi/qwifimanager.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
diff --git a/src/imports/wifi/qwifinetwork.cpp b/src/imports/wifi/qwifinetwork.cpp
index 5b74301..a159e59 100644
--- a/src/imports/wifi/qwifinetwork.cpp
+++ b/src/imports/wifi/qwifinetwork.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
diff --git a/src/imports/wifi/qwifinetwork.h b/src/imports/wifi/qwifinetwork.h
index e287d7e..780fc87 100644
--- a/src/imports/wifi/qwifinetwork.h
+++ b/src/imports/wifi/qwifinetwork.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
diff --git a/src/imports/wifi/qwifinetworklist.cpp b/src/imports/wifi/qwifinetworklist.cpp
index 432a07c..60fdc53 100644
--- a/src/imports/wifi/qwifinetworklist.cpp
+++ b/src/imports/wifi/qwifinetworklist.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/
diff --git a/src/imports/wifi/qwifinetworklist.h b/src/imports/wifi/qwifinetworklist.h
index 9c269b3..84e78fc 100644
--- a/src/imports/wifi/qwifinetworklist.h
+++ b/src/imports/wifi/qwifinetworklist.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
 ** http://qt.digia.com/