summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2015-07-12 16:04:44 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2015-07-16 11:58:19 +0000
commit01e0040dce2f7edbb7856d652b34703170918733 (patch)
treeb1eb5f70e42daad3aa55a13192c03cac5c0b2b10
parentfc1dc2d22781a46df2351848fa408eed96ccdd06 (diff)
downloadqtserialport-5.4.tar.gz
Move QT_DEPRECATED_SINCE(5,2 and 5,3) macro before than qdoc comments5.4
Change-Id: I72c455d2e5bbd660c53edd4bbb0b3fa5b08d806e Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r--src/serialport/qserialport.cpp4
1 files 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);