diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 19:55:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 19:55:41 +0200 |
| commit | 5a039bf53e88a727cc52bfedb21796ebfade01a1 (patch) | |
| tree | abce106bf1cb1042dcacd249152a11343caa0313 /src/network/socket | |
| parent | dbcf5730ac2d4f61f872e50126d3ce73e3f6031e (diff) | |
| parent | 89302b8b88b2bfa9581bb15c1caa052cb6d76988 (diff) | |
Merge dev into 5.6
Change-Id: I061f2513ef58f696e75b11928d89aaaf059659a3
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 4 | ||||
| -rw-r--r-- | src/network/socket/qabstractsocket.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 35b541d739..371b9e0264 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1810,12 +1810,12 @@ QString QAbstractSocket::peerName() const */ bool QAbstractSocket::canReadLine() const { - bool hasLine = d_func()->buffer.canReadLine(); + bool hasLine = QIODevice::canReadLine(); #if defined (QABSTRACTSOCKET_DEBUG) qDebug("QAbstractSocket::canReadLine() == %s, buffer size = %lld, size = %lld", hasLine ? "true" : "false", d_func()->buffer.size(), d_func()->buffer.size()); #endif - return hasLine || QIODevice::canReadLine(); + return hasLine; } /*! diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index b433c7e97f..23f0d26cbd 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -149,7 +149,7 @@ public: qint64 bytesAvailable() const Q_DECL_OVERRIDE; qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; + bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove me quint16 localPort() const; QHostAddress localAddress() const; |