From 26bef3a39fcdd78b431660b967306ef6170fc60b Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 17 Apr 2014 16:35:49 +0400 Subject: Fix the serial number display in the terminal example The display code was left out in commit 959775c41683033adbd99faab7e3d70e0009c143. Tested using FTDI device on Windows 8 with Qt5 and then on Windows 7 with Qt4. Change-Id: I9f665b2826ba03877346b25a569ca89b6a3dc4af Reviewed-by: Laszlo Papp Reviewed-by: Sergey Belyashov --- examples/serialport/terminal/settingsdialog.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp index 7b278bb..978e15b 100644 --- a/examples/serialport/terminal/settingsdialog.cpp +++ b/examples/serialport/terminal/settingsdialog.cpp @@ -88,9 +88,10 @@ void SettingsDialog::showPortInfo(int idx) QStringList list = ui->serialPortInfoListBox->itemData(idx).toStringList(); ui->descriptionLabel->setText(tr("Description: %1").arg(list.at(1))); ui->manufacturerLabel->setText(tr("Manufacturer: %1").arg(list.at(2))); - ui->locationLabel->setText(tr("Location: %1").arg(list.at(3))); - ui->vidLabel->setText(tr("Vendor Identifier: %1").arg(list.at(4))); - ui->pidLabel->setText(tr("Product Identifier: %1").arg(list.at(5))); + ui->serialNumberLabel->setText(tr("Serial number: %1").arg(list.at(3))); + ui->locationLabel->setText(tr("Location: %1").arg(list.at(4))); + ui->vidLabel->setText(tr("Vendor Identifier: %1").arg(list.at(5))); + ui->pidLabel->setText(tr("Product Identifier: %1").arg(list.at(6))); } } @@ -148,13 +149,16 @@ void SettingsDialog::fillPortsInfo() static const QString blankString = QObject::tr("N/A"); QString description; QString manufacturer; + QString serialNumber; foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) { QStringList list; description = info.description(); manufacturer = info.manufacturer(); + serialNumber = info.serialNumber(); list << info.portName() << (!description.isEmpty() ? description : blankString) << (!manufacturer.isEmpty() ? manufacturer : blankString) + << (!serialNumber.isEmpty() ? serialNumber : blankString) << info.systemLocation() << (info.vendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) : blankString) << (info.productIdentifier() ? QString::number(info.productIdentifier(), 16) : blankString); -- cgit v1.2.1