forked from qt-creator/qt-creator
McuSupport: Pass versioning from json to McuPackage ctor
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:
@@ -62,6 +62,7 @@ public:
|
||||
const QString &settingsKey,
|
||||
const QString &cmakeVarName,
|
||||
const QString &envVarName,
|
||||
const QStringList &versions = {},
|
||||
const QString &downloadUrl = {},
|
||||
const McuPackageVersionDetector *versionDetector = nullptr,
|
||||
const bool addToPath = false,
|
||||
@@ -73,7 +74,7 @@ public:
|
||||
QString cmakeVariableName() const override;
|
||||
QString environmentVariableName() const override;
|
||||
bool isAddToSystemPath() const override;
|
||||
void setVersions(const QStringList &versions) override;
|
||||
QStringList versions() const override;
|
||||
|
||||
Utils::FilePath basePath() const override;
|
||||
Utils::FilePath path() const override;
|
||||
@@ -129,7 +130,8 @@ public:
|
||||
const Utils::FilePath &detectionPath,
|
||||
const QString &settingsKey,
|
||||
ToolChainType toolchainType,
|
||||
const QString &cmakeVarName = {},
|
||||
const QStringList &versions,
|
||||
const QString &cmakeVarName,
|
||||
const QString &envVarName = {},
|
||||
const McuPackageVersionDetector *versionDetector = nullptr);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user