From b97dd9ea7a8e9aeeb63dcf173afa722f37d9a573 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 5 Aug 2019 13:43:48 +0200 Subject: 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 --- tests/auto/qserialport/tst_qserialport.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') 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(&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(&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(&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(&QSerialPort::error)); + QSignalSpy errorSpy(&serialPort, &QSerialPort::errorOccurred); QVERIFY(errorSpy.isValid()); QSignalSpy dtrSpy(&serialPort, &QSerialPort::dataTerminalReadyChanged); QVERIFY(dtrSpy.isValid()); -- cgit v1.2.3