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 --- examples/serialport/blockingslave/dialog.cpp | 3 +-- examples/serialport/cenumerator/main.cpp | 3 +-- examples/serialport/enumerator/main.cpp | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/examples/serialport/blockingslave/dialog.cpp b/examples/serialport/blockingslave/dialog.cpp index 1723086c..b95f3e70 100644 --- a/examples/serialport/blockingslave/dialog.cpp +++ b/examples/serialport/blockingslave/dialog.cpp @@ -99,8 +99,7 @@ Dialog::Dialog(QWidget *parent) : connect(m_serialPortComboBox, QOverload::of(&QComboBox::currentIndexChanged), this, &Dialog::activateRunButton); - connect(m_waitRequestSpinBox, QOverload::of(&QSpinBox::valueChanged), - this, &Dialog::activateRunButton); + connect(m_waitRequestSpinBox, &QSpinBox::textChanged, this, &Dialog::activateRunButton); connect(m_responseLineEdit, &QLineEdit::textChanged, this, &Dialog::activateRunButton); } diff --git a/examples/serialport/cenumerator/main.cpp b/examples/serialport/cenumerator/main.cpp index af6d7e41..902a7935 100644 --- a/examples/serialport/cenumerator/main.cpp +++ b/examples/serialport/cenumerator/main.cpp @@ -80,8 +80,7 @@ int main(int argc, char *argv[]) : blankString) << endl << "Product Identifier: " << (serialPortInfo.hasProductIdentifier() ? QByteArray::number(serialPortInfo.productIdentifier(), 16) - : blankString) << endl - << "Busy: " << (serialPortInfo.isBusy() ? "Yes" : "No") << endl; + : blankString) << endl; } return 0; diff --git a/examples/serialport/enumerator/main.cpp b/examples/serialport/enumerator/main.cpp index fef1ce08..ee213519 100644 --- a/examples/serialport/enumerator/main.cpp +++ b/examples/serialport/enumerator/main.cpp @@ -70,8 +70,7 @@ int main(int argc, char *argv[]) + QObject::tr("Manufacturer: ") + info.manufacturer() + "\n" + QObject::tr("Serial number: ") + info.serialNumber() + "\n" + QObject::tr("Vendor Identifier: ") + (info.hasVendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) : QString()) + "\n" - + QObject::tr("Product Identifier: ") + (info.hasProductIdentifier() ? QString::number(info.productIdentifier(), 16) : QString()) + "\n" - + QObject::tr("Busy: ") + (info.isBusy() ? QObject::tr("Yes") : QObject::tr("No")) + "\n"; + + QObject::tr("Product Identifier: ") + (info.hasProductIdentifier() ? QString::number(info.productIdentifier(), 16) : QString()) + "\n"; auto label = new QLabel(s); layout->addWidget(label); -- cgit v1.2.3