diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 12:43:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 18:57:25 +0200 |
| commit | 10967b1443720116744ecfc42fe442681d149c5a (patch) | |
| tree | a58a4a21239f8a4f4aefbdd9685101c5f005c2be /src/serialport/qserialport.cpp | |
| parent | 7ef82ae562bab6b8bf7043d8e377eff60bb87b8a (diff) | |
| parent | 133dbd59fb04974149d2140b267fce91a7cfd4a2 (diff) | |
| download | qtserialport-10967b1443720116744ecfc42fe442681d149c5a.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/serialport/qserialport_win.cpp
Change-Id: I8f3403d448ef2e51cf2870b331c61ab808393e34
Diffstat (limited to 'src/serialport/qserialport.cpp')
| -rw-r--r-- | src/serialport/qserialport.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index f7656c5..532c149 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -110,7 +110,6 @@ QSerialPortPrivate::QSerialPortPrivate() , startAsyncWriteTimer(0) , originalEventMask(0) , triggeredEventMask(0) - , actualBytesToWrite(0) #elif defined(Q_OS_UNIX) , descriptor(-1) , readNotifier(0) @@ -1249,13 +1248,7 @@ qint64 QSerialPort::bytesAvailable() const qint64 QSerialPort::bytesToWrite() const { Q_D(const QSerialPort); - qint64 bytes = QIODevice::bytesToWrite(); -#ifdef Q_OS_WIN32 - bytes += d->actualBytesToWrite; -#else - bytes += d->writeBuffer.size(); -#endif - return bytes; + return QIODevice::bytesToWrite() + d->writeBuffer.size(); } /*! |