summaryrefslogtreecommitdiffstats
path: root/examples/serialport/terminal/settingsdialog.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/serialport/terminal/settingsdialog.cpp')
-rw-r--r--examples/serialport/terminal/settingsdialog.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp
index ad32824e..923f0004 100644
--- a/examples/serialport/terminal/settingsdialog.cpp
+++ b/examples/serialport/terminal/settingsdialog.cpp
@@ -151,14 +151,19 @@ void SettingsDialog::fillPortsParameters()
void SettingsDialog::fillPortsInfo()
{
ui->serialPortInfoListBox->clear();
+ static const QString blankString = QObject::tr("N/A");
+ QString description;
+ QString manufacturer;
foreach (const QSerialPortInfo &info, QSerialPortInfo::availablePorts()) {
QStringList list;
+ description = info.description();
+ manufacturer = info.manufacturer();
list << info.portName()
- << info.description()
- << info.manufacturer()
+ << (!description.isEmpty() ? description : blankString)
+ << (!manufacturer.isEmpty() ? manufacturer : blankString)
<< info.systemLocation()
- << (info.vendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) : QString())
- << (info.productIdentifier() ? QString::number(info.productIdentifier(), 16) : QString());
+ << (info.vendorIdentifier() ? QString::number(info.vendorIdentifier(), 16) : blankString)
+ << (info.productIdentifier() ? QString::number(info.productIdentifier(), 16) : blankString);
ui->serialPortInfoListBox->addItem(list.first(), list);
}