diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:55:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-25 10:22:53 +0100 |
| commit | a325de1910e6627e4d042114d22303cc68fae7a9 (patch) | |
| tree | cabf88f9e4e42579e6695ecff5e6ab787f3922ab /src/serialport/qserialport_p.h | |
| parent | d42d5838b9a4c3cbd6b0e67dabce658ba737eba8 (diff) | |
| parent | b84fe7eb3d6d977a347bfbb82da724409b2eda69 (diff) | |
| download | qtserialport-a325de1910e6627e4d042114d22303cc68fae7a9.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
src/serialport/qserialport_unix.cpp
src/serialport/qserialport_unix_p.h
src/serialport/qserialport_win.cpp
src/serialport/qserialport_win_p.h
src/serialport/qserialport_wince.cpp
src/serialport/qserialport_wince_p.h
Change-Id: Ibb917652b132e66fbb90f437bf762c1094911dc0
Diffstat (limited to 'src/serialport/qserialport_p.h')
| -rw-r--r-- | src/serialport/qserialport_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index ef29678..8ce7a49 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -172,8 +172,6 @@ public: QSerialPort::StopBits stopBits; QSerialPort::FlowControl flowControl; QSerialPort::DataErrorPolicy policy; - bool dataTerminalReady; - bool requestToSend; bool settingsRestoredOnClose; bool isBreakEnabled; @@ -185,7 +183,7 @@ public: bool waitForReadOrWrite(bool *selectForRead, bool *selectForWrite, bool checkRead, bool checkWrite, - int msecs, bool *timedOut); + int msecs); void processIoErrors(bool error); bool notifyRead(); @@ -260,7 +258,7 @@ public: bool waitForReadOrWrite(bool *selectForRead, bool *selectForWrite, bool checkRead, bool checkWrite, - int msecs, bool *timedOut); + int msecs); qint64 readFromPort(char *data, qint64 maxSize); qint64 writeToPort(const char *data, qint64 maxSize); |