Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf

Change-Id: Id8be0cbb66eabf59c47011e4605e71cf29c1f532

1 files changed, 8 insertions, 6 deletions

diff --git a/src/serialport/qserialport_win_p.h b/src/serialport/qserialport_win_p.h
index 61e6ce8..3ccdb56 100644
--- a/src/serialport/qserialport_win_p.h
+++ b/src/serialport/qserialport_win_p.h
@@ -81,7 +81,7 @@ public:
     qint64 systemInputQueueSize ();
     qint64 systemOutputQueueSize ();
 
-    qint64 writeToBuffer(const char *data, qint64 maxSize);
+    void startWriting();
 
     bool waitForReadyRead(int msec);
     bool waitForBytesWritten(int msec);
@@ -96,14 +96,16 @@ public:
     void processIoErrors(bool error);
     QSerialPort::SerialPortError decodeSystemError() const;
 #ifndef Q_OS_WINCE
-    void _q_canCompleteCommunication();
-    void _q_canCompleteRead();
-    void _q_canCompleteWrite();
+    void _q_completeAsyncCommunication();
+    void _q_completeAsyncRead();
+    void _q_completeAsyncWrite();
 
+    bool startAsyncCommunication();
     bool startAsyncRead();
     bool startAsyncWrite();
-    void completeAsyncRead(DWORD numberOfBytes);
-    void completeAsyncWrite(DWORD numberOfBytes);
+
+    bool emulateErrorPolicy();
+    void emitReadyRead();
 #else
     bool notifyRead();
     bool notifyWrite();