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/qbluetoothsocket_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/qbluetoothsocket_osx.mm')
-rw-r--r-- | src/bluetooth/qbluetoothsocket_osx.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothsocket_osx.mm b/src/bluetooth/qbluetoothsocket_osx.mm index bf20220d..de7e2120 100644 --- a/src/bluetooth/qbluetoothsocket_osx.mm +++ b/src/bluetooth/qbluetoothsocket_osx.mm @@ -443,6 +443,8 @@ qint64 QBluetoothSocket::bytesToWrite() const void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, OpenMode openMode) { + OSXBluetooth::qt_test_iobluetooth_runloop(); + // Report this problem early, potentially avoid device discovery: if (socketType() == QBluetoothServiceInfo::UnknownProtocol) { qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "cannot connect with 'UnknownProtocol' type"; @@ -480,6 +482,8 @@ void QBluetoothSocket::connectToService(const QBluetoothServiceInfo &service, Op void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid, OpenMode openMode) { + OSXBluetooth::qt_test_iobluetooth_runloop(); + // Report this problem early, avoid device discovery: if (socketType() == QBluetoothServiceInfo::UnknownProtocol) { qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "cannot connect with 'UnknownProtocol' type"; @@ -505,6 +509,8 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const void QBluetoothSocket::connectToService(const QBluetoothAddress &address, quint16 port, OpenMode openMode) { + OSXBluetooth::qt_test_iobluetooth_runloop(); + if (socketType() == QBluetoothServiceInfo::UnknownProtocol) { qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "cannot connect with 'UnknownProtocol' type"; d_ptr->errorString = QCoreApplication::translate(SOCKET, SOC_NETWORK_ERROR); @@ -571,6 +577,8 @@ void QBluetoothSocket::setSocketError(QBluetoothSocket::SocketError socketError) void QBluetoothSocket::doDeviceDiscovery(const QBluetoothServiceInfo &service, OpenMode openMode) { + OSXBluetooth::qt_test_iobluetooth_runloop(); + setSocketState(ServiceLookupState); if (d_ptr->discoveryAgent) |