On 2014-04-22, Thiago Macieira <thiago.macie...@intel.com> wrote: > --- a/src/serialport/qserialport.h > +++ b/src/serialport/qserialport.h > @@ -64,11 +64,11 @@ 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)
Isn't it 5.3 we are releasing? > #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) > - Q_PROPERTY(bool settingsRestoredOnClose READ settingsRestoredOnClose > WRITE setSettingsRestoredOnClose NOTIFY settingsRestoredOnCloseChanged) > > Q_ENUMS(BaudRate DataBits Parity StopBits FlowControl DataErrorPolicy > SerialPortError) > Q_FLAGS(Directions PinoutSignals) > @@ -131,16 +131,6 @@ public: > UnknownFlowControl = -1 > }; > > +#if QT_DEPRECATED_SINCE(5, 2) same. > enum DataErrorPolicy { > SkipPolicy, > PassZeroPolicy, > @@ -196,9 +198,6 @@ public: > bool open(OpenMode mode) Q_DECL_OVERRIDE; > void close() Q_DECL_OVERRIDE; > > - void setSettingsRestoredOnClose(bool restore); > - bool settingsRestoredOnClose() const; > - > bool setBaudRate(qint32 baudRate, Directions directions = AllDirections); > qint32 baudRate(Directions directions = AllDirections) const; > > @@ -229,6 +228,8 @@ public: > #if QT_DEPRECATED_SINCE(5, 2) and here again > QT_DEPRECATED bool setDataErrorPolicy(DataErrorPolicy policy = > IgnorePolicy); > QT_DEPRECATED DataErrorPolicy dataErrorPolicy() const; > + void setSettingsRestoredOnClose(bool restore); > + bool settingsRestoredOnClose() const; > #endif > > SerialPortError error() const; /Sune _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development