summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/bluetooth.pro
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@theqtcompany.com>2015-11-24 10:28:01 +0100
committerTimur Pocheptsov <timur.pocheptsov@theqtcompany.com>2015-11-27 14:19:42 +0000
commite117459e0d3d0670aa2cc60dfa3eafe81bbf11a9 (patch)
tree14a495bd997005b9f76e85919d4792adf5a084cf /src/bluetooth/bluetooth.pro
parentdab0c9a010cf7fcd521707168cc8107b7ed6af24 (diff)
Bluetooth LE scan - move to its own dispatch queue (iOS/OS X)
Move CBCentralManager's delegate to its own dispatch queue, not the main one, so that even if somebody _blocks_ the main thread somehow, waiting for discovery to finish, the discovery can, indeed, finish. Also, make DDA aware of the fact that now actual scan and 'this' are working on different threads, thus we must be thread-safe. Task-number: QTBUG-49476 Change-Id: I9bcc74131f51389c8a014577c65e0943bbc8da42 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/bluetooth.pro')
-rw-r--r--src/bluetooth/bluetooth.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index e37ad7aa..6cf0795c 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -164,7 +164,8 @@ config_bluez:qtHaveModule(dbus) {
qlowenergyservice_osx.mm
PRIVATE_HEADERS += \
- qlowenergycontroller_osx_p.h
+ qlowenergycontroller_osx_p.h \
+ qbluetoothdevicediscoverytimer_osx_p.h
include(osx/osxbt.pri)
SOURCES += \