diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2020-04-23 15:57:31 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2020-04-23 18:03:46 +0000 |
commit | 91536ae7812e904334b0007445a64aecf3e120ad (patch) | |
tree | 1fef9f248ca75fef350d45c438f89bfd4cd71937 /src/plugins/baremetal | |
parent | 4c064c5f9b952cbc3791bad3b1573d7beda5b783 (diff) |
BareMetal: Don't handle an empty SVD file selection in UVSC provider
Change-Id: Ic7fbf2c403f85d7d79f194a12f67e852ff0bdd80
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/baremetal')
-rw-r--r-- | src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp index e9a3342857..f627367828 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp @@ -454,11 +454,13 @@ DeviceSelection DeviceSelectionView::buildSelection(const DeviceSelectionItem *i } } while ((item->level() > 1) && (item = static_cast<const DeviceSelectionItem *>(item->parent()))); - // Fix relative SVD file path to make it as absolute. - const QFileInfo fi(selection.svd); - if (!fi.isAbsolute()) { - const QDir dir(QFileInfo(selection.package.file).path()); - selection.svd = QFileInfo(dir, fi.filePath()).absoluteFilePath(); + // Fix relative SVD file sub-path to make it as an absolute file path. + if (!selection.svd.isEmpty()) { + const QFileInfo fi(selection.svd); + if (!fi.isAbsolute()) { + const QDir dir(QFileInfo(selection.package.file).path()); + selection.svd = QFileInfo(dir, fi.filePath()).absoluteFilePath(); + } } return selection; |