diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:22:00 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-04-07 15:22:00 +0300 |
| commit | 83ca3a2471560f09d723157322adc0b5c33ed914 (patch) | |
| tree | 565dd202b8245ffc41c5697ea9e1069781d43e01 /src/bluetooth/qbluetoothsocket_osx.mm | |
| parent | 4dcb2f232e00836830dcbffdc5dafbcde6607c08 (diff) | |
| parent | 5466df6f9b9237caba71a3ae323b931de1f7eda9 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into tqtc/lts-5.15-opensourcev5.15.4-lts-lgpl
Change-Id: I86f7492c32a43094f37cfb9b21ad1066aa49ba68
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_osx.mm')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_osx.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothsocket_osx.mm b/src/bluetooth/qbluetoothsocket_osx.mm index 8af085ac..dcb9aa03 100644 --- a/src/bluetooth/qbluetoothsocket_osx.mm +++ b/src/bluetooth/qbluetoothsocket_osx.mm @@ -519,8 +519,8 @@ void QBluetoothSocketPrivate::channelOpenComplete() Q_ASSERT_X(q_ptr, Q_FUNC_INFO, "invalid q_ptr (null)"); if (!isConnecting) { - q_ptr->setSocketState(QBluetoothSocket::ConnectedState); q_ptr->setOpenMode(openMode); + q_ptr->setSocketState(QBluetoothSocket::ConnectedState); emit q_ptr->connected(); } else { state = QBluetoothSocket::ConnectedState; @@ -537,10 +537,9 @@ void QBluetoothSocketPrivate::channelClosed() // (thus close/abort probably will not work). if (!isConnecting) { - q_ptr->setSocketState(QBluetoothSocket::UnconnectedState); q_ptr->setOpenMode(QIODevice::NotOpen); + q_ptr->setSocketState(QBluetoothSocket::UnconnectedState); emit q_ptr->readChannelFinished(); - emit q_ptr->disconnected(); } else { state = QBluetoothSocket::UnconnectedState; // We are still in connectToService and do not want |