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

McuSupport: Parse and create qt for MCUs package

Browse Source 
Change-Id: I295f8c275d67992ba633f194ace119c2784d8525
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Piotr Mućko
2022-08-01 17:05:19 +02:00
parent 4740430577
commit 662281e837
6 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -686,6 +686,9 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data)
const QJsonObject boardSdk = target.value("boardSdk").toObject();
const QJsonObject freeRTOS = target.value("freeRTOS").toObject();
const QJsonArray platformEntries = platform.value(CMAKE_ENTRIES).toArray();
const QList<PackageDescription> platformPackages{parsePackages(platformEntries)};
const PackageDescription toolchainPackage = parsePackage(compiler);
const PackageDescription toolchainFilePackage = parsePackage(toolchainFile);
const PackageDescription boardSdkPackage{parsePackage(boardSdk)};
@@ -712,14 +715,13 @@ McuTargetDescription parseDescriptionJson(const QByteArray &data)
return {qulVersion,
compatVersion,
{
platform.value("id").toString(),
platformName,
platform.value("vendor").toString(),
colorDepthsVector,
platformName == "Desktop" ? McuTargetDescription::TargetType::Desktop
: McuTargetDescription::TargetType::MCU,
},
{platform.value("id").toString(),
platformName,
platform.value("vendor").toString(),
colorDepthsVector,
platformName == "Desktop" ? McuTargetDescription::TargetType::Desktop
: McuTargetDescription::TargetType::MCU,
platformPackages},
{toolchain.value("id").toString(),
toolchainVersionsList,
toolchainPackage,