diff options
| author | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-07 16:31:55 +0300 |
|---|---|---|
| committer | Alexander Akulich <akulichalexander@gmail.com> | 2020-02-11 16:54:33 +0300 |
| commit | c034f92fc2e377f47a0f45efeb66905a0f45d0ae (patch) | |
| tree | b0f99e6d9de8e80a0e799fea815ed9ba3abe4de9 /src/network/socket/qlocalsocket.h | |
| parent | 11dc7b35c8c3957bd19087a5e3ae7cfc4f1a3343 (diff) | |
Revert "QLocalSocket - deprecate ambiguous 'error' overloads"
This reverts commit 0de6c26ac17c90f513329fdbe87ef036fc25925a.
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: I67dbb5cada25da473bdd02e71b1e2d9bd03f039e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/socket/qlocalsocket.h')
| -rw-r--r-- | src/network/socket/qlocalsocket.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 9cf76d1022..1876a6ac0d 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -97,12 +97,7 @@ public: virtual bool canReadLine() const override; virtual bool open(OpenMode openMode = ReadWrite) override; virtual void close() override; - -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_X("Use socketError()") LocalSocketError error() const; -#endif // QT_DEPRECATED_SINCE(5, 15) - - LocalSocketError socketError() const; + LocalSocketError error() const; bool flush(); bool isValid() const; qint64 readBufferSize() const; |