diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
| commit | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (patch) | |
| tree | 35c238f57be475e69abd3e34baa32a136739dfd5 /src/networksettings/connman/qnetworksettingsservice_p.cpp | |
| parent | f6de3a059ea2207104ff8f23718d714ac4ff41d2 (diff) | |
| parent | 57b15814c8865e517c43fe173c0ffcadf8557ade (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
* origin/5.7:
Doc: Document QtDeviceUtilities
Doc: Remove rest of the generic Qt for Device Creation doc files
Doc: Bump version to 5.7.1
Doc: Remove generic Device Creation documentation
Added additional instructions for Windows users using BeagleBone Black
Fixes to networkSettingsService model handling
Updated icons
Doc: Add documentation for NVIDIA DRIVE CX
Doc: Add documentation for Intel NUC
Doc: Remove references to SILICA ArchiTech Tibidabo
Doc: Bump version to 5.7.0
Fixed connman backend crashes and changed it as default.
Conflicts:
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
Change-Id: Idb13f9fd130211213434576ab5cc3d38766e9711
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsservice_p.cpp')
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsservice_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/networksettings/connman/qnetworksettingsservice_p.cpp b/src/networksettings/connman/qnetworksettingsservice_p.cpp index c7ac462..8a7b2cf 100644 --- a/src/networksettings/connman/qnetworksettingsservice_p.cpp +++ b/src/networksettings/connman/qnetworksettingsservice_p.cpp @@ -239,8 +239,8 @@ QNetworkSettingsServicePrivate::QNetworkSettingsServicePrivate(const QString& id ,q_ptr(parent) ,m_id(id) { - qDBusRegisterMetaType<ConnmanMap>(); - qDBusRegisterMetaType<ConnmanMapList>(); + qDBusRegisterMetaType<ConnmanMapStruct>(); + qDBusRegisterMetaType<ConnmanMapStructList>(); m_service = new NetConnmanServiceInterface(QStringLiteral("net.connman"), m_id, QDBusConnection::systemBus(), this); |