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

4
src/plugins/mcusupport/mcusupportoptions.h
View File

@@ -88,7 +88,7 @@ public:
void writeGeneralSettings() const; void writeGeneralSettings() const;
bool writeToSettings() const; bool writeToSettings() const;
void setRelativePathModifier(const QString &path); void setRelativePathModifier(const QString &path);
void setVersions(const QVector<QString> &versions); void setVersions(const QStringList &versions);
bool automaticKitCreationEnabled() const; bool automaticKitCreationEnabled() const;
void setAutomaticKitCreationEnabled(const bool enabled); void setAutomaticKitCreationEnabled(const bool enabled);
@@ -118,7 +118,7 @@ private:
Utils::FilePath m_path; Utils::FilePath m_path;
QString m_relativePathModifier; // relative path to m_path to be returned by path() QString m_relativePathModifier; // relative path to m_path to be returned by path()
QString m_detectedVersion; QString m_detectedVersion;
QVector<QString> m_versions; QStringList m_versions;
QString m_downloadUrl; QString m_downloadUrl;
QString m_environmentVariableName; QString m_environmentVariableName;
bool m_addToPath = false; bool m_addToPath = false;

12
src/plugins/mcusupport/mcusupportsdk.cpp
View File

@@ -341,13 +341,13 @@ struct McuTargetDescription
} platform; } platform;
struct { struct {
QString id; QString id;
QVector<QString> versions; QStringList versions;
} toolchain; } toolchain;
struct { struct {
QString name; QString name;
QString defaultPath; QString defaultPath;
QString envVar; QString envVar;
QVector<QString> versions; QStringList versions;
} boardSdk; } boardSdk;
struct { struct {
QString envVar; QString envVar;
@@ -658,10 +658,10 @@ static McuTargetDescription parseDescriptionJsonCommon(const QString &qulVersion
const QJsonObject freeRTOS = target.value("freeRTOS").toObject(); const QJsonObject freeRTOS = target.value("freeRTOS").toObject();
const QVariantList toolchainVersions = toolchain.value("versions").toArray().toVariantList(); const QVariantList toolchainVersions = toolchain.value("versions").toArray().toVariantList();
const auto toolchainVersionsVector = Utils::transform<QVector<QString> >( const auto toolchainVersionsList = Utils::transform<QStringList>(
toolchainVersions, [&](const QVariant &version) { return version.toString(); }); toolchainVersions, [&](const QVariant &version) { return version.toString(); });
const QVariantList boardSdkVersions = boardSdk.value("versions").toArray().toVariantList(); const QVariantList boardSdkVersions = boardSdk.value("versions").toArray().toVariantList();
const auto boardSdkVersionsVector = Utils::transform<QVector<QString> >( const auto boardSdkVersionsList = Utils::transform<QStringList>(
boardSdkVersions, [&](const QVariant &version) { return version.toString(); }); boardSdkVersions, [&](const QVariant &version) { return version.toString(); });
return { return {
@@ -670,13 +670,13 @@ static McuTargetDescription parseDescriptionJsonCommon(const QString &qulVersion
{}, {},
{ {
toolchain.value("id").toString(), toolchain.value("id").toString(),
toolchainVersionsVector, toolchainVersionsList,
}, },
{ {
boardSdk.value("name").toString(), boardSdk.value("name").toString(),
boardSdk.value("defaultPath").toString(), boardSdk.value("defaultPath").toString(),
boardSdk.value("envVar").toString(), boardSdk.value("envVar").toString(),
boardSdkVersionsVector, boardSdkVersionsList,
}, },
{ {
freeRTOS.value("envVar").toString(), freeRTOS.value("envVar").toString(),