diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 09:42:01 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-10-17 09:42:13 +0200 |
| commit | fc2a206322f6190226ebc1f04062f2c9170f0bac (patch) | |
| tree | 7df8ca41816c24ccfa6e0c6add4612689a933bdd /src/bluetooth/qbluetoothsocket_bluez.cpp | |
| parent | ca5490859338f28e30104668a353275d23df1ec6 (diff) | |
| parent | 125cdccc346903d6e70ed26289cdaed85e26ec3f (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btle
Change-Id: Ia1cbaac9774ce2bc1b6972c02bad34fa593d40ff
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_bluez.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_bluez.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket_bluez.cpp b/src/bluetooth/qbluetoothsocket_bluez.cpp index 42c5503b..17b8e738 100644 --- a/src/bluetooth/qbluetoothsocket_bluez.cpp +++ b/src/bluetooth/qbluetoothsocket_bluez.cpp @@ -290,7 +290,9 @@ void QBluetoothSocketPrivate::_q_readNotify() qCWarning(QT_BT_BLUEZ) << Q_FUNC_INFO << socket << "error:" << readFromDevice << errorString; if (errsv == EHOSTDOWN) q->setSocketError(QBluetoothSocket::HostNotFoundError); - else if (errsv != ECONNRESET) // The other side closing the connection is not an error. + else if (errsv == ECONNRESET) + q->setSocketError(QBluetoothSocket::RemoteHostClosedError); + else q->setSocketError(QBluetoothSocket::UnknownSocketError); q->disconnectFromService(); @@ -592,4 +594,14 @@ qint64 QBluetoothSocketPrivate::bytesAvailable() const return buffer.size(); } +qint64 QBluetoothSocketPrivate::bytesToWrite() const +{ + return txBuffer.size(); +} + +bool QBluetoothSocketPrivate::canReadLine() const +{ + return buffer.canReadLine(); +} + QT_END_NAMESPACE |