diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:38:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:38:22 +0200 |
| commit | 462f074efbf6ac2cf03b818fa4103f5529be0291 (patch) | |
| tree | 759989cfee8e546ebe3e0fa8fb8b51a01dc6ca04 /src/serialport/qserialport.cpp | |
| parent | bec0b027f802d20dee00a33e9bc83d1d07b2dd42 (diff) | |
| parent | 3e6308409dd679389e6231745e4d919d68d6487c (diff) | |
| download | qtserialport-462f074efbf6ac2cf03b818fa4103f5529be0291.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I8b8dcf2103583b0a9113a0369a89aaa71c0b1b4b
Diffstat (limited to 'src/serialport/qserialport.cpp')
| -rw-r--r-- | src/serialport/qserialport.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 8bf71c6..74604b0 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1371,8 +1371,6 @@ bool QSerialPort::isBreakEnabled() const // method will be called. qint64 QSerialPort::readData(char *data, qint64 maxSize) { - Q_D(QSerialPort); - Q_UNUSED(data); Q_UNUSED(maxSize); @@ -1381,6 +1379,7 @@ qint64 QSerialPort::readData(char *data, qint64 maxSize) // in case we have a limited read buffer size. Because the read notification can // be stalled since Windows do not re-triggered an EV_RXCHAR event if a driver's // buffer has a remainder of data ready to read until a new data will be received. + Q_D(QSerialPort); if (d->readBufferMaxSize || d->flowControl == QSerialPort::HardwareControl) d->startAsyncRead(); #endif |