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/bluetoothsettings/bluez/bluez.pri | |
| 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/bluetoothsettings/bluez/bluez.pri')
| -rw-r--r-- | src/bluetoothsettings/bluez/bluez.pri | 11 |
1 files changed, 8 insertions, 3 deletions
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 + +} |