diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-09 11:58:34 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-10 12:54:53 +0100 |
| commit | 94b3dd77f29a00ebbd1efdc66d75f57e1c75b152 (patch) | |
| tree | b95a984789b506b6a0e4df03648717e20282d2e2 /tests/baselineserver/shared/baselineprotocol.cpp | |
| parent | 9a112bebe56f5975bdb11549c8d66773cf60419f (diff) | |
QAbstractSocket: deprecate 'error' member-function
The one that is a getter for the last error found. This is to disambiguate
the expression '&QAbstractSocket::error'. Introduce a new member-function
socketError as a replacement.
[ChangeLog][Deprecation Notice] QAbstractSocket::error() (the getter) is deprecated; superseded by socketError().
Task-number: QTBUG-80369
Change-Id: Ia2e3d108657aaa7929ab0810babe2ede309740ba
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/baselineserver/shared/baselineprotocol.cpp')
| -rw-r--r-- | tests/baselineserver/shared/baselineprotocol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/baselineserver/shared/baselineprotocol.cpp b/tests/baselineserver/shared/baselineprotocol.cpp index aa496d6c54..9e5321cb1b 100644 --- a/tests/baselineserver/shared/baselineprotocol.cpp +++ b/tests/baselineserver/shared/baselineprotocol.cpp @@ -545,7 +545,7 @@ bool BaselineProtocol::receiveBlock(Command *cmd, QByteArray *block) QString BaselineProtocol::errorMessage() { QString ret = errMsg; - if (socket.error() >= 0) + if (socket.socketError() >= 0) ret += QLS(" Socket state: ") + socket.errorString(); return ret; } |