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

McuSupport: Fix compile for gcc 5.3

Browse Source 
Change-Id: I389330addba4b4516eb5da8f72b41b56f612888a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Christian Stenger
2020-05-15 06:53:10 +02:00
parent 9edf0056ae
commit 0767107c55
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,11 +330,11 @@ static QFileInfoList targetDescriptionFiles(const Utils::FilePath &dir)
static QString freeRTOSEnvVarForPlatform(const QString &platform) static QString freeRTOSEnvVarForPlatform(const QString &platform)
{ {
if (platform == "STM32F769I-DISCOVERY" || platform == "STM32F7508-DISCOVERY") if (platform == "STM32F769I-DISCOVERY" || platform == "STM32F7508-DISCOVERY")
return "STM32F7_FREERTOS_DIR"; return {"STM32F7_FREERTOS_DIR"};
else if (platform == "MIMXRT1050-EVK") else if (platform == "MIMXRT1050-EVK")
return "IMXRT1050_FREERTOS_DIR"; return {"IMXRT1050_FREERTOS_DIR"};
else if (platform == "MIMXRT1064-EVK") else if (platform == "MIMXRT1064-EVK")
return "IMXRT1064_FREERTOS_DIR"; return {"IMXRT1064_FREERTOS_DIR"};
return {}; return {};
} }
@@ -382,7 +382,7 @@ void targetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage *> *packa
if (!descriptions.isEmpty()) { if (!descriptions.isEmpty()) {
// Workaround for missing JSON file for Desktop target: // Workaround for missing JSON file for Desktop target:
descriptions.prepend({McuSupportOptions::supportedQulVersion().toString(), descriptions.prepend({McuSupportOptions::supportedQulVersion().toString(),
"Qt", "Qt", {32}, "desktop", {}, {}}); {"Qt"}, {"Qt"}, {32}, {"desktop"}, {}, {}});
mcuTargets->append(targetsFromDescriptions(descriptions, packages)); mcuTargets->append(targetsFromDescriptions(descriptions, packages));
} }