diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 08:56:40 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 08:56:47 +0200 |
| commit | 125cdccc346903d6e70ed26289cdaed85e26ec3f (patch) | |
| tree | 7df8ca41816c24ccfa6e0c6add4612689a933bdd /src/bluetooth/qbluetoothservicediscoveryagent_osx.mm | |
| parent | 844382001f8deaa7fcc9faac779b24188f35329b (diff) | |
| parent | 013ad0570844975cd5c72a77d1cfefa30c3ea656 (diff) | |
Merge remote-tracking branch 'gerrit/5.10' into dev
Change-Id: I3bf7130a204aebd6a52dfe68bfea57767ba1b70e
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 e1e73a0c..1d0cc7da 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) { |