From 057921868881295c0128204f2f4e53956b0a3d3c Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Fri, 15 Dec 2017 17:02:42 +0200 Subject: Use connman with bluetooth only if networksettings are available Task-number: QTBUG-64693 Change-Id: Id2ce5342a0749d123a499c6c519d5ae2e6c3cae9 Reviewed-by: Sami Nurmenniemi Reviewed-by: Samuli Piippo --- src/bluetoothsettings/bluez/bluez.pri | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/bluetoothsettings/bluez/bluez.pri') 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 + +} -- cgit v1.2.3