diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-16 15:07:38 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-12-16 15:07:38 +0200 |
commit | 4f54d9b10ebdd296accfa5526d7c941a03249a50 (patch) | |
tree | 80cdb907a68a65775852142a71be553ab0b9a0f4 /src/imports/networksettings | |
parent | 48af5733bcd959146ac157a3c4759c8d89ccc465 (diff) | |
parent | c494f7b4debb2d789154c4297c9bee420ac96b2b (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
* origin/5.7:
Rename main project file to match project name
Fix compile error in qtdevicesettings
Fix QNetworkSettingsManager usage from the C++
Fix Wifi utils connection view
Make bluetooth support optional
Fix typo
Remove unneeded include
Use new style signals and slots connection
Fix uninitialized variables
Fix unused variable warning
Fix deprecated QString warning
Qt does not name getter functions with 'get'
Fix compile errors: declaration of ‘<X>’ shadows a member of 'this'
Fix compile error: No Qt keywords allowed in header files
Fix compile error: 0 is not allowed for pointer initialization anymore
Conflicts:
src/bluetoothsettings/bluetoothdevice.h
src/bluetoothsettings/bluez/bluetoothdevice_p.h
src/bluetoothsettings/discoverymodel.h
src/displaysettings/displaysettings.h
src/displaysettings/displaysettings_p.h
src/localdevice/qlocaldevice.h
src/localesettings/localemodel.h
src/localesettings/systemlocale.h
src/networksettings/connman/qnetworksettingsinterface_p.h
src/networksettings/connman/qnetworksettingsservice_p.h
src/networksettings/connman/qnetworksettingsuseragent_p.h
src/networksettings/qnetworksettings.h
src/networksettings/qnetworksettingsaddressmodel.h
src/networksettings/qnetworksettingsinterface.h
src/networksettings/qnetworksettingsinterfacemodel.h
src/networksettings/qnetworksettingsmanager.h
src/networksettings/qnetworksettingsservice.h
src/networksettings/qnetworksettingsservicemodel.h
src/networksettings/qnetworksettingsuseragent.h
src/networksettings/wpasupplicant/qnetworksettingsservice_p.h
src/timedatesettings/systemtime.h
src/timedatesettings/timezonemodel.h
Change-Id: I7db3a24e41718e5951ec33336a1a4bd08b33e823
Diffstat (limited to 'src/imports/networksettings')
-rw-r--r-- | src/imports/networksettings/plugin.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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>); } |