diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport.cpp | 3 | ||||
| -rw-r--r-- | src/serialport/qserialport.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 66a0241..4ef7016 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.6.0 +MODULE_VERSION = 5.7.0 diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 38bd150..3469e80 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1088,8 +1088,7 @@ bool QSerialPort::clear(Directions directions) */ bool QSerialPort::atEnd() const { - Q_D(const QSerialPort); - return QIODevice::atEnd() && (!isOpen() || (d->buffer.size() == 0)); + return QIODevice::atEnd(); } #if QT_DEPRECATED_SINCE(5, 2) diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index a19e1bf..af37f16 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -237,7 +237,7 @@ public: bool flush(); bool clear(Directions directions = AllDirections); - bool atEnd() const Q_DECL_OVERRIDE; + bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove me #if QT_DEPRECATED_SINCE(5, 2) QT_DEPRECATED bool setDataErrorPolicy(DataErrorPolicy policy = IgnorePolicy); |