feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BareMetal: Don't handle an empty SVD file selection in UVSC provider

Browse Source 
Change-Id: Ic7fbf2c403f85d7d79f194a12f67e852ff0bdd80
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Denis Shienkov
2020-04-23 15:57:31 +03:00
parent 4c064c5f9b
commit 91536ae781
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp
View File

@@ -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;