summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2019-08-05 13:43:48 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2019-08-05 14:40:35 +0200
commitb97dd9ea7a8e9aeeb63dcf173afa722f37d9a573 (patch)
tree19df2564b40940401bf13d42e8ceebf1f866ebdb /tests
parentad2628329e1685dbccd0ac3c5011336cd2c4f786 (diff)
Remove usages of deprecated APIs
- Fixed the build with disabled deprecated APIs. - Made the docs for deprecated APIs to compile conditionally, based on the deprecation version. Task-number: QTBUG-76491 Change-Id: I38fbd84254d3d35b2bc208994c9fd70142450ad8 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qserialport/tst_qserialport.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qserialport/tst_qserialport.cpp b/tests/auto/qserialport/tst_qserialport.cpp
index 94eaaa5c..f55dac76 100644
--- a/tests/auto/qserialport/tst_qserialport.cpp
+++ b/tests/auto/qserialport/tst_qserialport.cpp
@@ -272,7 +272,7 @@ void tst_QSerialPort::openExisting()
for (const QString &serialPortName : qAsConst(m_availablePortNames)) {
QSerialPort serialPort(serialPortName);
- QSignalSpy errorSpy(&serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error));
+ QSignalSpy errorSpy(&serialPort, &QSerialPort::errorOccurred);
QVERIFY(errorSpy.isValid());
QCOMPARE(serialPort.portName(), serialPortName);
@@ -304,7 +304,7 @@ void tst_QSerialPort::openNotExisting()
QSerialPort serialPort(serialPortName);
- QSignalSpy errorSpy(&serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error));
+ QSignalSpy errorSpy(&serialPort, &QSerialPort::errorOccurred);
QVERIFY(errorSpy.isValid());
QCOMPARE(serialPort.portName(), serialPortName);
@@ -477,7 +477,7 @@ void tst_QSerialPort::rts()
{
QSerialPort serialPort(m_senderPortName);
- QSignalSpy errorSpy(&serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error));
+ QSignalSpy errorSpy(&serialPort, &QSerialPort::errorOccurred);
QVERIFY(errorSpy.isValid());
QSignalSpy rtsSpy(&serialPort, &QSerialPort::requestToSendChanged);
QVERIFY(rtsSpy.isValid());
@@ -516,7 +516,7 @@ void tst_QSerialPort::dtr()
{
QSerialPort serialPort(m_senderPortName);
- QSignalSpy errorSpy(&serialPort, static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error));
+ QSignalSpy errorSpy(&serialPort, &QSerialPort::errorOccurred);
QVERIFY(errorSpy.isValid());
QSignalSpy dtrSpy(&serialPort, &QSerialPort::dataTerminalReadyChanged);
QVERIFY(dtrSpy.isValid());