diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:05 +0200 |
| commit | 7b443cd0fdd1940a8bfaad73df5e309a52b7669f (patch) | |
| tree | d6eedd5d35db41c09864997596b0749b12a2e6f4 /src/bluetooth/qbluetoothsocket_p.cpp | |
| parent | c4b8dee6b4cfdc6728094d237d7984791e2cecea (diff) | |
| parent | 052e7ce371d4719df778ad8b378bcf1af14d294b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Iff285e35cdca30fee28c7927bc01498d70f9de9e
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; } |