diff options
-rw-r--r-- | src/serialport/qserialport_p.h | 11 | ||||
-rw-r--r-- | src/serialport/qserialport_symbian_p.h | 11 | ||||
-rw-r--r-- | src/serialport/qserialport_unix_p.h | 11 | ||||
-rw-r--r-- | src/serialport/qserialport_win.cpp | 3 | ||||
-rw-r--r-- | src/serialport/qserialport_win_p.h | 11 | ||||
-rw-r--r-- | src/serialport/qserialport_wince_p.h | 11 | ||||
-rw-r--r-- | src/serialport/qserialportinfo_p.h | 11 | ||||
-rw-r--r-- | src/serialport/qtudev_p.h | 11 |
8 files changed, 80 insertions, 0 deletions
diff --git a/src/serialport/qserialport_p.h b/src/serialport/qserialport_p.h index e969f2f2..364e050b 100644 --- a/src/serialport/qserialport_p.h +++ b/src/serialport/qserialport_p.h @@ -44,6 +44,17 @@ #ifndef QSERIALPORT_P_H #define QSERIALPORT_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qserialport.h" #include <private/qringbuffer_p.h> diff --git a/src/serialport/qserialport_symbian_p.h b/src/serialport/qserialport_symbian_p.h index 258a8111..e2cf1683 100644 --- a/src/serialport/qserialport_symbian_p.h +++ b/src/serialport/qserialport_symbian_p.h @@ -42,6 +42,17 @@ #ifndef QSERIALPORT_SYMBIAN_P_H #define QSERIALPORT_SYMBIAN_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qserialport_p.h" #include <c32comm.h> diff --git a/src/serialport/qserialport_unix_p.h b/src/serialport/qserialport_unix_p.h index ee3d82d5..1213c30a 100644 --- a/src/serialport/qserialport_unix_p.h +++ b/src/serialport/qserialport_unix_p.h @@ -43,6 +43,17 @@ #ifndef QSERIALPORT_UNIX_P_H #define QSERIALPORT_UNIX_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qserialport_p.h" #include <QtCore/qlockfile.h> diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 19f35b74..ecbf464a 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -327,6 +327,9 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) QElapsedTimer stopWatch; stopWatch.start(); + if (!writeStarted && !startAsyncWrite()) + return false; + const qint64 initialReadBufferSize = readBuffer.size(); qint64 currentReadBufferSize = initialReadBufferSize; diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h index a997315b..f4297ef5 100644 --- a/src/serialport/qserialport_win_p.h +++ b/src/serialport/qserialport_win_p.h @@ -43,6 +43,17 @@ #ifndef QSERIALPORT_WIN_P_H #define QSERIALPORT_WIN_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qserialport_p.h" #include <QtCore/qhash.h> diff --git a/src/serialport/qserialport_wince_p.h b/src/serialport/qserialport_wince_p.h index 9697dc72..91bba3c7 100644 --- a/src/serialport/qserialport_wince_p.h +++ b/src/serialport/qserialport_wince_p.h @@ -43,6 +43,17 @@ #ifndef QSERIALPORT_WINCE_P_H #define QSERIALPORT_WINCE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qserialport_p.h" #include <QtCore/qmutex.h> diff --git a/src/serialport/qserialportinfo_p.h b/src/serialport/qserialportinfo_p.h index 47319410..1fb8a608 100644 --- a/src/serialport/qserialportinfo_p.h +++ b/src/serialport/qserialportinfo_p.h @@ -44,6 +44,17 @@ #ifndef QSERIALPORTINFO_P_H #define QSERIALPORTINFO_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/qstring.h> QT_BEGIN_NAMESPACE diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h index 0f0246dc..09940abf 100644 --- a/src/serialport/qtudev_p.h +++ b/src/serialport/qtudev_p.h @@ -42,6 +42,17 @@ #ifndef QTUDEV_P_H #define QTUDEV_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifdef LINK_LIBUDEV extern "C" { |