From 01e0040dce2f7edbb7856d652b34703170918733 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Sun, 12 Jul 2015 16:04:44 +0300 Subject: Move QT_DEPRECATED_SINCE(5,2 and 5,3) macro before than qdoc comments Change-Id: I72c455d2e5bbd660c53edd4bbb0b3fa5b08d806e Reviewed-by: Marc Mutz --- src/serialport/qserialport.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 0e60036..b546e93 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -552,6 +552,7 @@ void QSerialPort::close() d->close(); } +#if QT_DEPRECATED_SINCE(5, 3) /*! \property QSerialPort::settingsRestoredOnClose \brief the flag which specifies to restore the previous settings when closing @@ -562,7 +563,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); @@ -1043,6 +1043,7 @@ bool QSerialPort::atEnd() const return QIODevice::atEnd() && (!isOpen() || (d->readBuffer.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 @@ -1059,7 +1060,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); -- cgit v1.2.1