diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2020-05-15 06:53:10 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2020-05-15 05:20:01 +0000 |
| commit | 0767107c5585fb0d4cdb35c60841c06908847e35 (patch) | |
| tree | 8f519f8914d0c17940fccfaf22a7043fbdfc0f7d | |
| parent | 9edf0056aed137466a2de7a1ebfaf6bd7b4d95db (diff) | |
| download | qt-creator-0767107c5585fb0d4cdb35c60841c06908847e35.tar.gz | |
McuSupport: Fix compile for gcc 5.3
Change-Id: I389330addba4b4516eb5da8f72b41b56f612888a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/plugins/mcusupport/mcusupportsdk.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 42e59f80c9..757d919315 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<McuPackage *> *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)); } |