diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:41 +0200 |
| commit | d3b44f36c91bd3066be0c8f39efd53aa122c3c86 (patch) | |
| tree | d5772a9074f8fe8a21097b13fa6a2ce0986bdd46 /src/serialport/qserialport_unix.cpp | |
| parent | 26bef3a39fcdd78b431660b967306ef6170fc60b (diff) | |
| parent | d1e689f8c5162ec77e6fa08fbb4e988545c5c4ab (diff) | |
| download | qtserialport-d3b44f36c91bd3066be0c8f39efd53aa122c3c86.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Idadda494181f643ef1b7fc2b2fb16dc5d215e83a
Diffstat (limited to 'src/serialport/qserialport_unix.cpp')
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index dd4edb0..4f9ca19 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -410,7 +410,7 @@ bool QSerialPortPrivate::setRequestToSend(bool set) bool QSerialPortPrivate::flush() { - return startAsyncWrite() + return completeAsyncWrite() #ifndef Q_OS_ANDROID && (::tcdrain(descriptor) != -1); #else |