summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2016-11-30 10:26:15 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2016-12-08 05:15:43 +0000
commitf23aa97aeca62d9ddcc753ab97fa3b6c297db5b9 (patch)
tree16829407029e8993d2ec63e64e527b0894a50dd7 /src
parentd426c05d15ec25b51cb66448021f969d216dd4ea (diff)
downloadqtserialport-f23aa97aeca62d9ddcc753ab97fa3b6c297db5b9.tar.gz
qserialport.cpp: Silence deprecation warning
qserialport.cpp: In member function 'void QSerialPort::setSettingsRestoredOnClose(bool)': qserialport.cpp:627:9: warning: 'void QSerialPort::settingsRestoredOnCloseChanged(bool)' is deprecated [-Wdeprecated-declarations] Change-Id: I4ed17403cd1692c4f965a69be711f0c5b03a8376 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/serialport/qserialport.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp
index d23e3b6..8fd42b5 100644
--- a/src/serialport/qserialport.cpp
+++ b/src/serialport/qserialport.cpp
@@ -607,6 +607,9 @@ void QSerialPort::close()
QIODevice::close();
}
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
#if QT_DEPRECATED_SINCE(5, 3)
/*!
\property QSerialPort::settingsRestoredOnClose
@@ -628,6 +631,8 @@ void QSerialPort::setSettingsRestoredOnClose(bool restore)
}
}
+QT_WARNING_POP
+
bool QSerialPort::settingsRestoredOnClose() const
{
Q_D(const QSerialPort);