diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 09:05:48 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 09:06:07 +0200 |
| commit | ca5490859338f28e30104668a353275d23df1ec6 (patch) | |
| tree | 98df1ca5a4cb3852f03496bb0bf4e13d838063a2 /src/bluetooth/qbluetoothsocket_p.cpp | |
| parent | 4976498621fb05804201dad52eab2c59d94f0da3 (diff) | |
| parent | 4593b79d84b9c8cc818d3c30e3882d699228339f (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into btle
Change-Id: Ic8a6a7f8bf36b5604ec758e89091a04e60df993a
Diffstat (limited to 'src/bluetooth/qbluetoothsocket_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_p.cpp index 5ebba4ad..6007b924 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_p.cpp @@ -131,7 +131,7 @@ qint64 QBluetoothSocketPrivate::readData(char *data, qint64 maxSize) Q_Q(QBluetoothSocket); if (state != QBluetoothSocket::ConnectedState) { - errorString = QBluetoothSocket::tr("Cannot write while not connected"); + errorString = QBluetoothSocket::tr("Cannot read while not connected"); q->setSocketError(QBluetoothSocket::OperationError); return -1; } |