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

McuSupport: avoid double-space strings in warnings

Browse Source 
Change-Id: Ia40412154662ce9a22ae569c9f8abf31b419cbce
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christiaan Janssen
2021-11-15 09:48:47 +01:00
parent ffc30fedc9
commit 983ca3106d
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -258,7 +258,7 @@ void McuPackage::setRelativePathModifier(const QString &path)
m_relativePathModifier = path;
}
void McuPackage::setVersions(const QVector<QString> &versions)
void McuPackage::setVersions(const QStringList &versions)
{
m_versions = versions;
}
@@ -312,13 +312,14 @@ void McuPackage::updateStatusUi()
QString McuPackage::statusText() const
{
const QString displayPackagePath = m_path.toUserOutput();
const QString displayVersions = QStringList(m_versions.toList()).join(" or ");
const QString displayRequiredPath = QString("%1 %2").arg(
FilePath::fromString(m_detectionPath).toUserOutput(),
displayVersions);
const QString displayDetectedPath = QString("%1 %2").arg(
FilePath::fromString(m_detectionPath).toUserOutput(),
m_detectedVersion);
const QString displayVersions = m_versions.join(" or ");
const QString outDetectionPath = FilePath::fromString(m_detectionPath).toUserOutput();
const QString displayRequiredPath = m_versions.empty() ?
outDetectionPath :
QString("%1 %2").arg(outDetectionPath, displayVersions);
const QString displayDetectedPath = m_versions.empty() ?
outDetectionPath :
QString("%1 %2").arg(outDetectionPath, m_detectedVersion);
QString response;
switch (m_status) {