diff options
| author | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-07 16:43:07 +0300 |
|---|---|---|
| committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-26 23:07:52 +0300 |
| commit | 6d18e4a2b8d82519df177bff5a86a8eca5dae9e6 (patch) | |
| tree | ccb1462a3c60f802e4b4f72cb1900212217e2084 /tests/baselineserver | |
| parent | e1920f65936fe7d712441e88c023746ab5c21cee (diff) | |
| download | qtbase-6d18e4a2b8d82519df177bff5a86a8eca5dae9e6.tar.gz | |
Revert "QAbstractSocket: deprecate 'error' member-function"
This reverts commit 94b3dd77f29a00ebbd1efdc66d75f57e1c75b152.
The patch fixes ambiguity between a getter and a signal by changing the
getter name, but we still have to rename the signal to follow the signals
naming convention.
Revert the commit to keep the getter as is and change the signal name instead.
Change-Id: I0dd60cf1ae9d1bd95beeb8ad58661ca4b1fb63b9
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/baselineserver')
| -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 9e5321cb1b..aa496d6c54 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.socketError() >= 0) + if (socket.error() >= 0) ret += QLS(" Socket state: ") + socket.errorString(); return ret; } |