From 523ff2cf52ff32c270fcdbed4da85db65baea44d Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 1 Dec 2014 17:40:28 +0100 Subject: QLowEnergyController/Service - enable for iOS Enable Core Bluetooth-based version for iOS. Change-Id: Ica13fdc6c01744713483771e7c8ad6153c9fccdf Reviewed-by: Alex Blasche --- src/bluetooth/bluetooth.pro | 10 +++++++++- src/bluetooth/osx/osxbt.pri | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index b6783425..593431c3 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -183,7 +183,12 @@ config_bluez:qtHaveModule(dbus) { LIBS += -framework Foundation -framework CoreBluetooth OBJECTIVE_SOURCES += \ - qbluetoothdevicediscoveryagent_ios.mm + qbluetoothdevicediscoveryagent_ios.mm \ + qlowenergycontroller_osx.mm \ + qlowenergyservice_osx.mm + + PRIVATE_HEADERS += \ + qlowenergycontroller_osx_p.h include(osx/osxbt.pri) SOURCES += \ @@ -196,6 +201,9 @@ config_bluez:qtHaveModule(dbus) { qlowenergycontroller_p.cpp SOURCES -= qbluetoothdevicediscoveryagent.cpp + SOURCES -= qlowenergycontroller_p.cpp + SOURCES -= qlowenergyservice.cpp + SOURCES -= qlowenergycontroller.cpp } else { message("Unsupported Bluetooth platform, will not build a working QtBluetooth library.") message("Either no Qt D-Bus found or no BlueZ headers.") diff --git a/src/bluetooth/osx/osxbt.pri b/src/bluetooth/osx/osxbt.pri index 1eddcf4c..96ad3905 100644 --- a/src/bluetooth/osx/osxbt.pri +++ b/src/bluetooth/osx/osxbt.pri @@ -33,9 +33,11 @@ CONFIG(osx) { PRIVATE_HEADERS += osx/osxbtutility_p.h \ osx/osxbtledeviceinquiry_p.h \ osx/corebluetoothwrapper_p.h \ - osx/osxbtcentralmanagerdelegate_p.h + osx/osxbtcentralmanagerdelegate_p.h \ + osx/osxbtcentralmanager_p.h OBJECTIVE_SOURCES += osx/osxbtutility.mm \ osx/osxbtledeviceinquiry.mm \ - osx/osxbtcentralmanagerdelegate.mm + osx/osxbtcentralmanagerdelegate.mm \ + osx/osxbtcentralmanager.mm } -- cgit v1.2.3