summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslsocket.h
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@qt.io>2020-07-22 15:08:08 +0200
committerTimur Pocheptsov <timur.pocheptsov@qt.io>2020-07-23 11:37:29 +0200
commitfbf3b3121f3517a2a0e0595635f2430e46323e9b (patch)
tree858de8b599c50d4b3486e5732e264c6000979c50 /src/network/ssl/qsslsocket.h
parente85c531c5111bf8305d5789d90d151204952ddb1 (diff)
QSslSocket::flush - purge the function marked for removal in Qt6
QAbstractSocket::flush stopped being virtual and, instead, QAbstractSocketPrivate::flush is now virtual. So the code in QSslSocket is essentially a duplicate. Change-Id: Iebb33c8490268270b90a662ab64b1ae47c4cbac7 Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket.h')
-rw-r--r--src/network/ssl/qsslsocket.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 3408e36197..c63a74a68c 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -118,7 +118,6 @@ public:
bool canReadLine() const override;
void close() override;
bool atEnd() const override;
- bool flush(); // ### Qt6: remove me (implementation moved to private flush())
void abort();
// From QAbstractSocket: