diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 12:47:41 +0200 |
| commit | d3b44f36c91bd3066be0c8f39efd53aa122c3c86 (patch) | |
| tree | d5772a9074f8fe8a21097b13fa6a2ce0986bdd46 | |
| parent | 26bef3a39fcdd78b431660b967306ef6170fc60b (diff) | |
| parent | d1e689f8c5162ec77e6fa08fbb4e988545c5c4ab (diff) | |
| download | qtserialport-d3b44f36c91bd3066be0c8f39efd53aa122c3c86.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Idadda494181f643ef1b7fc2b2fb16dc5d215e83a
| -rw-r--r-- | src/serialport/qserialport.h | 11 | ||||
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h index 6ca5af4..ee88c25 100644 --- a/src/serialport/qserialport.h +++ b/src/serialport/qserialport.h @@ -64,11 +64,13 @@ class Q_SERIALPORT_EXPORT QSerialPort : public QIODevice Q_PROPERTY(FlowControl flowControl READ flowControl WRITE setFlowControl NOTIFY flowControlChanged) #if QT_DEPRECATED_SINCE(5, 2) Q_PROPERTY(DataErrorPolicy dataErrorPolicy READ dataErrorPolicy WRITE setDataErrorPolicy NOTIFY dataErrorPolicyChanged) - Q_PROPERTY(bool settingsRestoredOnClose READ settingsRestoredOnClose WRITE setSettingsRestoredOnClose NOTIFY settingsRestoredOnCloseChanged) #endif Q_PROPERTY(bool dataTerminalReady READ isDataTerminalReady WRITE setDataTerminalReady NOTIFY dataTerminalReadyChanged) Q_PROPERTY(bool requestToSend READ isRequestToSend WRITE setRequestToSend NOTIFY requestToSendChanged) Q_PROPERTY(SerialPortError error READ error RESET clearError NOTIFY error) +#if QT_DEPRECATED_SINCE(5, 3) + Q_PROPERTY(bool settingsRestoredOnClose READ settingsRestoredOnClose WRITE setSettingsRestoredOnClose NOTIFY settingsRestoredOnCloseChanged) +#endif Q_ENUMS(BaudRate DataBits Parity StopBits FlowControl DataErrorPolicy SerialPortError) Q_FLAGS(Directions PinoutSignals) @@ -198,6 +200,11 @@ public: bool open(OpenMode mode) Q_DECL_OVERRIDE; void close() Q_DECL_OVERRIDE; +#if QT_DEPRECATED_SINCE(5, 3) + QT_DEPRECATED void setSettingsRestoredOnClose(bool restore); + QT_DEPRECATED bool settingsRestoredOnClose() const; +#endif + bool setBaudRate(qint32 baudRate, Directions directions = AllDirections); qint32 baudRate(Directions directions = AllDirections) const; @@ -228,8 +235,6 @@ public: #if QT_DEPRECATED_SINCE(5, 2) QT_DEPRECATED bool setDataErrorPolicy(DataErrorPolicy policy = IgnorePolicy); QT_DEPRECATED DataErrorPolicy dataErrorPolicy() const; - void setSettingsRestoredOnClose(bool restore); - bool settingsRestoredOnClose() const; #endif SerialPortError error() const; diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index dd4edb0..4f9ca19 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -410,7 +410,7 @@ bool QSerialPortPrivate::setRequestToSend(bool set) bool QSerialPortPrivate::flush() { - return startAsyncWrite() + return completeAsyncWrite() #ifndef Q_OS_ANDROID && (::tcdrain(descriptor) != -1); #else |