diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 07:50:11 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 07:50:11 +0200 |
| commit | 013ad0570844975cd5c72a77d1cfefa30c3ea656 (patch) | |
| tree | 9fb1d5afc8b29f97a60ca20d514269b9d1658ef2 /src/bluetooth/qbluetoothservicediscoveryagent_osx.mm | |
| parent | 18af3226765b62312acc8f801cc531fde0d9822b (diff) | |
| parent | 80d85141aa496583c5cfa6dd0f62d5eb4a8ba660 (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into 5.10v5.10.0-beta3
Change-Id: I84bfe86751c27eabb4e75912ae3c0b4d3781faf1
Diffstat (limited to 'src/bluetooth/qbluetoothservicediscoveryagent_osx.mm')
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_osx.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm index 25bb2447..0b2f593d 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm +++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm @@ -526,6 +526,8 @@ QBluetoothAddress QBluetoothServiceDiscoveryAgent::remoteAddress() const void QBluetoothServiceDiscoveryAgent::start(DiscoveryMode mode) { + OSXBluetooth::qt_test_iobluetooth_runloop(); + if (d_ptr->discoveryState() == QBluetoothServiceDiscoveryAgentPrivate::Inactive && d_ptr->error != InvalidBluetoothAdapterError) { |