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

McuSupport: 2.2 does not use legacy implementation

Browse Source 
Change-Id: I77ba78f8997f1727de5b39cc49811e1def4287d5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Piotr Mućko
2022-04-01 13:28:09 +02:00
parent a3fbfac814
commit 50fddf1128
6 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,8 +589,7 @@ bool checkDeprecatedSdkError(const Utils::FilePath &qulDir, QString &message)
McuSdkRepository targetsAndPackages(const Utils::FilePath &dir)
{
QList<McuTargetDescription> descriptions;
bool isLegacy = false;
bool isLegacy{false};
auto descriptionFiles = targetDescriptionFiles(dir);
for (const QFileInfo &fileInfo : descriptionFiles) {
@@ -610,8 +609,7 @@ McuSdkRepository targetsAndPackages(const Utils::FilePath &dir)
}
const auto qulVersion{QVersionNumber::fromString(desc.qulVersion)};
if (qulVersion == McuSupportOptions::minimalQulVersion())
isLegacy = true;
isLegacy = McuSupportOptions::isLegacyVersion(qulVersion);
if (qulVersion < McuSupportOptions::minimalQulVersion()) {
const QString legacyVersion = legacySupportVersionFor(desc.qulVersion);