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

McuSupport: Pass versioning from json to McuPackage ctor

Browse Source 
Use versions parameter from JSON kits.
Instead of setting version in separate step pass it directly
to ctor.

Change-Id: I7ac9017d56dafa316f95ba4c504dcb0af641dbdc
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Piotr Mućko
2022-06-07 20:58:42 +02:00
parent 18b8506d4a
commit 2bdb75ac7a
13 changed files with 150 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/mcusupport/mcupackage.cpp
View File

@@ -57,6 +57,7 @@ McuPackage::McuPackage(const SettingsHandler::Ptr &settingsHandler,
const QString &settingsKey,
const QString &cmakeVarName,
const QString &envVarName,
const QStringList &versions,
const QString &downloadUrl,
const McuPackageVersionDetector *versionDetector,
const bool addToSystemPath,
@@ -68,6 +69,7 @@ McuPackage::McuPackage(const SettingsHandler::Ptr &settingsHandler,
, m_settingsKey(settingsKey)
, m_versionDetector(versionDetector)
, m_relativePathModifier(relativePathModifier)
, m_versions(versions)
, m_cmakeVariableName(cmakeVarName)
, m_environmentVariableName(envVarName)
, m_downloadUrl(downloadUrl)
@@ -101,9 +103,9 @@ bool McuPackage::isAddToSystemPath() const
return m_addToSystemPath;
}
void McuPackage::setVersions(const QStringList &versions)
QStringList McuPackage::versions() const
{
m_versions = versions;
return m_versions;
}
FilePath McuPackage::basePath() const
@@ -279,6 +281,7 @@ McuToolChainPackage::McuToolChainPackage(const SettingsHandler::Ptr &settingsHan
const FilePath &detectionPath,
const QString &settingsKey,
McuToolChainPackage::ToolChainType type,
const QStringList &versions,
const QString &cmakeVarName,
const QString &envVarName,
const McuPackageVersionDetector *versionDetector)
@@ -289,7 +292,8 @@ McuToolChainPackage::McuToolChainPackage(const SettingsHandler::Ptr &settingsHan
settingsKey,
cmakeVarName,
envVarName,
{},
versions,
{}, // url
versionDetector)
, m_type(type)
{}