diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:13:32 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-22 22:13:32 +0200 |
| commit | 5f858d319fa3c2fd6ce0e6d0deed081b4c44b7b2 (patch) | |
| tree | a1c2bd23b42fcda99070b05afef333a594d04645 | |
| parent | 0973537c5471288726b929250199a41435729bee (diff) | |
| parent | 728f3e7383ac6f7364126bf55684d51dec51cd69 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4694207fc852aefd7302c2db9153c37f304cc3c4
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 16 | ||||
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index fed47ed5..f72322f4 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -1282,14 +1282,26 @@ static const BaudRateMap createStandardBaudRateMap() baudRateMap.insert(4800, B4800); #endif +#ifdef B7200 + baudRateMap.insert(7200, B7200); +#endif + #ifdef B9600 baudRateMap.insert(9600, B9600); #endif +#ifdef B14400 + baudRateMap.insert(14400, B14400); +#endif + #ifdef B19200 baudRateMap.insert(19200, B19200); #endif +#ifdef B28800 + baudRateMap.insert(28800, B28800); +#endif + #ifdef B38400 baudRateMap.insert(38400, B38400); #endif @@ -1298,6 +1310,10 @@ static const BaudRateMap createStandardBaudRateMap() baudRateMap.insert(57600, B57600); #endif +#ifdef B76800 + baudRateMap.insert(76800, B76800); +#endif + #ifdef B115200 baudRateMap.insert(115200, B115200); #endif diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 562d59e5..3d9e98aa 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -987,7 +987,7 @@ bool QSerialPortPrivate::waitAnyEvent(int msecs, bool *timedOut, DWORD waitResult = ::WaitForMultipleObjects(handles.count(), handles.constData(), FALSE, // wait any event - qMax(msecs, 0)); + msecs == -1 ? INFINITE : msecs); if (waitResult == WAIT_TIMEOUT) { *timedOut = true; q->setError(QSerialPort::TimeoutError); |