diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-03-15 15:13:26 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-03-21 08:17:43 +0200 |
| commit | f2e3fcb6097e0119e63a0bab135957589aa227c5 (patch) | |
| tree | 3024001d9b88e3c801e8af04b457e573777932a2 | |
| parent | b5ff4334a4cd3232f74d8dd67133fadce73eca1f (diff) | |
Remove QBluetoothSocket::connected double-emit on macOS
The private macOS socket class first calls
QBluetoothSocket::setSocketState(Connected) which emits the "connected"
signal, and after that call the private class emits another
"connected" signal. The latter signal seems extra, causing
tst_qbluetoothsocket test to fail when run against a real device.
Fixes: QTBUG-101721
Change-Id: Ibf9cddcab65286c5decb920b7998086d18a13e18
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 3282843229e4a2b7945ec707a5a4fa9ccade9ecd)
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_osx.mm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothsocket_osx.mm b/src/bluetooth/qbluetoothsocket_osx.mm index 60825048..a663d54a 100644 --- a/src/bluetooth/qbluetoothsocket_osx.mm +++ b/src/bluetooth/qbluetoothsocket_osx.mm @@ -393,7 +393,6 @@ void QBluetoothSocketPrivate::connectToService(const QBluetoothAddress &address, // Connected, setOpenMode on a QBluetoothSocket. q_ptr->setOpenMode(openMode); q_ptr->setSocketState(QBluetoothSocket::ConnectedState); - emit q_ptr->connected(); if (buffer.size()) // We also have some data already ... emit q_ptr->readyRead(); } else if (state == QBluetoothSocket::UnconnectedState) { @@ -521,7 +520,6 @@ void QBluetoothSocketPrivate::channelOpenComplete() if (!isConnecting) { q_ptr->setOpenMode(openMode); q_ptr->setSocketState(QBluetoothSocket::ConnectedState); - emit q_ptr->connected(); } else { state = QBluetoothSocket::ConnectedState; // We are still in connectToService, it'll care |