diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2014-04-23 11:50:09 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 19:51:40 +0200 |
| commit | d1e689f8c5162ec77e6fa08fbb4e988545c5c4ab (patch) | |
| tree | 4c7548b1e3a4b012f0e5163057c97f1a5af62fe1 | |
| parent | fd58ceecf8a61e44392c73ec5bbdd276fe0ddce8 (diff) | |
| download | qtserialport-d1e689f8c5162ec77e6fa08fbb4e988545c5c4ab.tar.gz | |
Mark the settingsRestoredOnClose property deprecated since 5.3
Commit bc0a65234440b6a08d862840a48ebae0d3421fbc incorrectly
marked this api as deprecated since 5.2
Change-Id: Ia4ea3d7a394376a16511a3bf2ad8ba6e051bc24d
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/serialport/qserialport.h | 11 |
1 files changed, 8 insertions, 3 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; |