diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp index 785582f137a..1834dbfe50e 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp @@ -111,6 +111,11 @@ static void extractAllFiles(const DebuggerRunTool *runTool, QStringList &include } } +QString buildPackageId(const DeviceSelection &selection) +{ + return buildPackageId(selection.package); +} + // Project Project::Project(const UvscServerProvider *provider, DebuggerRunTool *runTool) diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.h b/src/plugins/baremetal/debugservers/uvsc/uvproject.h index 6642cf6cc3c..ccc11bd6111 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvproject.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.h @@ -39,6 +39,11 @@ class UvscServerProvider; namespace Uv { +class DeviceSelection; + +// Helper function. +QString buildPackageId(const DeviceSelection &selection); + // UvProject class Project final : public Gen::Xml::Project diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp index d75923f5516..e8aeb770793 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#include "uvproject.h" // for targetUVisionPath() +#include "uvproject.h" // for buildPackageId() #include "uvtargetdevicemodel.h" #include "uvtargetdeviceviewer.h" @@ -75,10 +75,10 @@ DeviceSelectorDetailsPanel::DeviceSelectorDetailsPanel(DeviceSelection &selectio m_vendorEdit = new QLineEdit; m_vendorEdit->setReadOnly(true); layout->addRow(tr("Vendor:"), m_vendorEdit); - m_fimilyEdit = new QLineEdit;; - m_fimilyEdit->setReadOnly(true); - layout->addRow(tr("Family:"), m_fimilyEdit); - m_descEdit = new QPlainTextEdit;; + m_packageEdit = new QLineEdit; + m_packageEdit->setReadOnly(true); + layout->addRow(tr("Package:"), m_packageEdit); + m_descEdit = new QPlainTextEdit; m_descEdit->setReadOnly(true); layout->addRow(tr("Description:"), m_descEdit); m_memoryView = new DeviceSelectionMemoryView(m_selection); @@ -118,7 +118,7 @@ static QString trimVendor(const QString &vendor) void DeviceSelectorDetailsPanel::refresh() { m_vendorEdit->setText(trimVendor(m_selection.vendorName)); - m_fimilyEdit->setText(m_selection.family); + m_packageEdit->setText(buildPackageId(m_selection)); m_descEdit->setPlainText(m_selection.desc); m_memoryView->refresh(); m_algorithmView->refresh(); diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h index d65bc64153e..a1639c48647 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h @@ -105,7 +105,7 @@ signals: private: DeviceSelection &m_selection; QLineEdit *m_vendorEdit = nullptr; - QLineEdit *m_fimilyEdit = nullptr; + QLineEdit *m_packageEdit = nullptr; QPlainTextEdit *m_descEdit = nullptr; DeviceSelectionMemoryView *m_memoryView = nullptr; DeviceSelectionAlgorithmView *m_algorithmView = nullptr;