diff options
| author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-12-15 17:02:42 +0200 |
|---|---|---|
| committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-12-19 10:03:53 +0000 |
| commit | 057921868881295c0128204f2f4e53956b0a3d3c (patch) | |
| tree | 9738ecdcca5fc9310b1ee5cfadd13bb5da85d829 /src | |
| parent | 44d7f1865af8a8b4491f2d272f9e8e16f09c741b (diff) | |
Use connman with bluetooth only if networksettings are available
Task-number: QTBUG-64693
Change-Id: Id2ce5342a0749d123a499c6c519d5ae2e6c3cae9
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.cpp | 7 | ||||
| -rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.h | 6 | ||||
| -rw-r--r-- | src/bluetoothsettings/bluez/bluez.pri | 11 |
3 files changed, 21 insertions, 3 deletions
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp index 8850f14..7b29ec9 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp @@ -32,8 +32,11 @@ #include "objectmanager_interface.cpp" #include "moc_objectmanager_interface.cpp" #include "device1_interface.h" + +#ifdef USE_CONNMAN_BLUETOOTH #include "connman_technology_interface.h" #include "connmancommon.h" +#endif QT_BEGIN_NAMESPACE @@ -51,9 +54,11 @@ BluetoothDevicePrivate::BluetoothDevicePrivate(BluetoothDevice *parent) : QObjec m_manager = new OrgFreedesktopDBusObjectManagerInterface(QStringLiteral("org.bluez"), QStringLiteral("/"), QDBusConnection::systemBus(), this); +#ifdef USE_CONNMAN_BLUETOOTH m_technology = new NetConnmanTechnologyInterface(QStringLiteral("net.connman"), QStringLiteral("/net/connman/technology/bluetooth"), QDBusConnection::systemBus(), this); +#endif QDBusPendingReply<ManagedObjectList> reply = m_manager->GetManagedObjects(); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this); connect(watcher, &QDBusPendingCallWatcher::finished, @@ -77,7 +82,9 @@ void BluetoothDevicePrivate::setPowered(const bool& aPowered) if (!m_localDevice) return; +#ifdef USE_CONNMAN_BLUETOOTH m_technology->SetProperty(PropertyPowered, QDBusVariant(QVariant(aPowered))); +#endif if (aPowered) { m_localDevice->powerOn(); diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index 0c32a2f..0e1777e 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -48,7 +48,10 @@ // Automatically generated classes in global namespace class OrgBluezDevice1Interface; class OrgFreedesktopDBusObjectManagerInterface; + +#ifdef USE_CONNMAN_BLUETOOTH class NetConnmanTechnologyInterface; +#endif QT_BEGIN_NAMESPACE @@ -92,7 +95,10 @@ private: QString m_adapter; DiscoveryModel *m_deviceModel; OrgFreedesktopDBusObjectManagerInterface *m_manager; + +#ifdef USE_CONNMAN_BLUETOOTH NetConnmanTechnologyInterface *m_technology; +#endif }; QT_END_NAMESPACE diff --git a/src/bluetoothsettings/bluez/bluez.pri b/src/bluetoothsettings/bluez/bluez.pri index 2aad8b8..60a3b17 100644 --- a/src/bluetoothsettings/bluez/bluez.pri +++ b/src/bluetoothsettings/bluez/bluez.pri @@ -2,12 +2,10 @@ QT += core dbus INCLUDEPATH += $${PWD} INCLUDEPATH += $${PWD}/bluez -INCLUDEPATH += $${PWD}/../../networksettings/connman DBUS_INTERFACES = \ $${PWD}/objectmanager.xml \ - $${PWD}/device1.xml \ - $${PWD}/../../networksettings/connman/connman_technology.xml + $${PWD}/device1.xml HEADERS += \ $$PWD/bluetoothdevice_p.h \ @@ -15,3 +13,10 @@ HEADERS += \ SOURCES += \ $$PWD/bluetoothdevice_p.cpp + +qtHaveModule(networksettings) { + DEFINES += USE_CONNMAN_BLUETOOTH + INCLUDEPATH += $${PWD}/../../networksettings/connman + DBUS_INTERFACES += $${PWD}/../../networksettings/connman/connman_technology.xml + +} |