From 1652f4a05d65cf410701e38c4334fba9cf81eb95 Mon Sep 17 00:00:00 2001
From: Teemu Holappa <teemu.holappa@qt.io>
Date: Tue, 1 Nov 2016 13:02:10 +0200
Subject: Fix QNetworkSettingsManager usage from the C++

Fixed servicesChanged signal handling.
Fixed services and interfaces functions return types in QNetworkSettingsManager.

Task-number: QTBUG-56760
Change-Id: Iaade0d5c06e8ff8f8dea4b421e226ae6348a9fe5
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
---
 src/imports/networksettings/plugin.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/imports/networksettings/plugin.cpp')

diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index 245e952..c1dac53 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -31,6 +31,8 @@
 #include <qnetworksettingsmanager.h>
 #include <qnetworksettingsservice.h>
 #include <qnetworksettingsuseragent.h>
+#include <qnetworksettingsservicemodel.h>
+#include <qnetworksettingsinterfacemodel.h>
 
 #include <qqml.h>
 #include <QQmlEngine>
@@ -44,7 +46,7 @@
     \brief Provides singleton QML types for controlling network settings.
 
     Provides singleton QML types for controlling network settings in an
-    embedded device.
+    embedded device.QAbstractItemModel
 
     Import the module as follows:
 
@@ -106,7 +108,7 @@
 */
 
 /*!
-    \qmlmethod NetworkService NetworkSettingsManager::getService(string name, int type)
+    \qmlmethod NetworkService NetworkSettingsManager::service(string name, int type)
 
     Returns the service with name \a name and type \a type.
 
@@ -161,5 +163,8 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<QNetworkSettingsState>(uri, 1, 0, "NetworkSettingsState", "Cannot be instantiated directly.");
 
     qRegisterMetaType<QNetworkSettingsUserAgent*>("QNetworkSettingsUserAgent*");
+    qRegisterMetaType<QNetworkSettingsServiceFilter*>("QNetworkSettingsServiceFilter*");
+    qRegisterMetaType<QNetworkSettingsInterfaceModel*>("QNetworkSettingsInterfaceModel*");
+
     qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
 }
-- 
cgit v1.2.3