diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:25:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:25:58 +0100 |
| commit | 05b3e3cf8678287a7d43a13e4ababe9a067f2dcf (patch) | |
| tree | 50ca008ff71704f2530ab4556524023c53d34b56 /src/serialport/qserialport_unix_p.h | |
| parent | 8e92374dc2cd48248be107ae48528a3c4330718e (diff) | |
| parent | 2a83fbd6c70032d236bbdf0d87aaf51908cd5afd (diff) | |
| download | qtserialport-05b3e3cf8678287a7d43a13e4ababe9a067f2dcf.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id8be0cbb66eabf59c47011e4605e71cf29c1f532
Diffstat (limited to 'src/serialport/qserialport_unix_p.h')
| -rw-r--r-- | src/serialport/qserialport_unix_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h index dba0ac5..7dbb760 100644 --- a/src/serialport/qserialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -111,7 +111,7 @@ public: qint64 systemInputQueueSize () const; qint64 systemOutputQueueSize () const; - qint64 writeToBuffer(const char *data, qint64 maxSize); + void startWriting(); bool waitForReadyRead(int msecs); bool waitForBytesWritten(int msecs); |