diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:11:21 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-07-17 18:12:16 +0200 |
| commit | 10a37e9f7fed2c80aac09ac1c662f6a0b3de37f7 (patch) | |
| tree | 74fa9bafa05da9d3da47e66b5a4780cb5535ae0c /src/serialport/qserialport.cpp | |
| parent | adccf2dcacd3fdd66e09c38302f9ce543d55f572 (diff) | |
| parent | 01e0040dce2f7edbb7856d652b34703170918733 (diff) | |
| download | qtserialport-10a37e9f7fed2c80aac09ac1c662f6a0b3de37f7.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: Ibf52d73727ece041fea18c0711f018ddf9cc7960
Diffstat (limited to 'src/serialport/qserialport.cpp')
| -rw-r--r-- | src/serialport/qserialport.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index e7874f0..9ed1c5f 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -570,6 +570,7 @@ void QSerialPort::close() QIODevice::close(); } +#if QT_DEPRECATED_SINCE(5, 3) /*! \property QSerialPort::settingsRestoredOnClose \brief the flag which specifies to restore the previous settings when closing @@ -580,7 +581,6 @@ void QSerialPort::close() The default state of the QSerialPort class is to restore the settings. */ -#if QT_DEPRECATED_SINCE(5,3) void QSerialPort::setSettingsRestoredOnClose(bool restore) { Q_D(QSerialPort); @@ -1063,6 +1063,7 @@ bool QSerialPort::atEnd() const return QIODevice::atEnd() && (!isOpen() || (d->buffer.size() == 0)); } +#if QT_DEPRECATED_SINCE(5, 2) /*! \property QSerialPort::dataErrorPolicy \brief the error policy for how the process receives characters in the case where @@ -1079,7 +1080,6 @@ bool QSerialPort::atEnd() const with the kernel and hardware. Hence, the two scenarios cannot be completely compared to each other. */ -#if QT_DEPRECATED_SINCE(5, 2) bool QSerialPort::setDataErrorPolicy(DataErrorPolicy policy) { Q_D(QSerialPort); |