From 0767107c5585fb0d4cdb35c60841c06908847e35 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 15 May 2020 06:53:10 +0200 Subject: [PATCH] McuSupport: Fix compile for gcc 5.3 Change-Id: I389330addba4b4516eb5da8f72b41b56f612888a Reviewed-by: Alessandro Portale --- src/plugins/mcusupport/mcusupportsdk.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 42e59f80c9a..757d919315b 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -330,11 +330,11 @@ static QFileInfoList targetDescriptionFiles(const Utils::FilePath &dir) static QString freeRTOSEnvVarForPlatform(const QString &platform) { if (platform == "STM32F769I-DISCOVERY" || platform == "STM32F7508-DISCOVERY") - return "STM32F7_FREERTOS_DIR"; + return {"STM32F7_FREERTOS_DIR"}; else if (platform == "MIMXRT1050-EVK") - return "IMXRT1050_FREERTOS_DIR"; + return {"IMXRT1050_FREERTOS_DIR"}; else if (platform == "MIMXRT1064-EVK") - return "IMXRT1064_FREERTOS_DIR"; + return {"IMXRT1064_FREERTOS_DIR"}; return {}; } @@ -382,7 +382,7 @@ void targetsAndPackages(const Utils::FilePath &dir, QVector *packa if (!descriptions.isEmpty()) { // Workaround for missing JSON file for Desktop target: descriptions.prepend({McuSupportOptions::supportedQulVersion().toString(), - "Qt", "Qt", {32}, "desktop", {}, {}}); + {"Qt"}, {"Qt"}, {32}, {"desktop"}, {}, {}}); mcuTargets->append(targetsFromDescriptions(descriptions, packages)); }