diff options
| author | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-12-01 17:40:28 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2014-12-03 16:38:59 +0100 |
| commit | 523ff2cf52ff32c270fcdbed4da85db65baea44d (patch) | |
| tree | 8d5a019e4e2189cf67d44a764b162069fdbac202 | |
| parent | 9af938515ef88ccf8f6acca78bbb558487a22414 (diff) | |
QLowEnergyController/Service - enable for iOS
Enable Core Bluetooth-based version for iOS.
Change-Id: Ica13fdc6c01744713483771e7c8ad6153c9fccdf
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 10 | ||||
| -rw-r--r-- | src/bluetooth/osx/osxbt.pri | 6 |
2 files changed, 13 insertions, 3 deletions
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 } |