Merge Boot2Qt Wifi module into Network Settings Plugin.

Added wpasupplicant as alternative backend for the network settings.

Change-Id: Ic05b3e87def2c9a143c30e4045a36db294ce8719
Reviewed-by: Risto Avila <risto.avila@theqtcompany.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/src/qtdevicesettings/networksettingsplugin/networksettingsplugin_plugin.cpp b/src/qtdevicesettings/networksettingsplugin/networksettingsplugin_plugin.cpp
index 3480b56..badb5ef 100644
--- a/src/qtdevicesettings/networksettingsplugin/networksettingsplugin_plugin.cpp
+++ b/src/qtdevicesettings/networksettingsplugin/networksettingsplugin_plugin.cpp
@@ -43,13 +43,6 @@
 #include <QQmlEngine>
 #include <QQmlContext>
 
-template <typename T>
-QObject *instance(QQmlEngine *engine, QJSEngine *) {
-    T *t = new T(engine);
-    t->setObjectName(T::staticMetaObject.className());
-    return t;
-}
-
 void NetworksettingspluginPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.network"));
@@ -59,6 +52,16 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QNetworkSettingsProxy>(uri, 1, 0, "NetworkSettingsProxy", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsType>(uri, 1, 0, "NetworkSettingsType", "Cannot be instantiated directly.");
     qmlRegisterUncreatableType<QNetworkSettingsState>(uri, 1, 0, "NetworkSettingsState", "Cannot be instantiated directly.");
-    qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
-    qmlRegisterSingletonType<QNetworkSettingsUserAgent>(uri, 1, 0, "NetworkSettingsUserAgent", &instance<QNetworkSettingsUserAgent>);
+}
+
+
+void NetworksettingspluginPlugin::initializeEngine(QQmlEngine * engine, const char * uri)
+{
+    Q_ASSERT(QLatin1String(uri) == QLatin1String("com.theqtcompany.settings.network"));
+    QNetworkSettingsManager* networkManager = new QNetworkSettingsManager(engine);
+    QNetworkSettingsUserAgent* userAgent = new QNetworkSettingsUserAgent(engine);
+    networkManager->setUserAgent(userAgent);
+
+    engine->rootContext()->setContextProperty("NetworkSettingsManager", networkManager);
+    engine->rootContext()->setContextProperty("NetworkSettingsUserAgent", userAgent);
 }