From bc25c7b3fe9f99146f09f2880d8252df16520b09 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 13 Feb 2020 12:28:24 +0100 Subject: [PATCH] McuSupport: Remove flashing of bootloader for STM An earlier version of Qt for MCUs had run CMake targets like flash__and_bootloader. At some point they were removed. Now, Qt Creator will not use that CMake target, as-well. Change-Id: Ie122acd042f816fafd27779d164e87ec00c509a5 Reviewed-by: hjk --- src/plugins/mcusupport/mcusupportrunconfiguration.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp index 5ea78779eb3..1f9b4dbe67e 100644 --- a/src/plugins/mcusupport/mcusupportrunconfiguration.cpp +++ b/src/plugins/mcusupport/mcusupportrunconfiguration.cpp @@ -54,10 +54,7 @@ static QStringList flashAndRunArgs(const Target *target) const QString projectName = target->project()->displayName(); // TODO: Hack! Implement flash target name handling, properly - const QString targetName = - target->kit()->value(Constants::KIT_MCUTARGET_VENDOR_KEY).toString() == "NXP" - ? QString("flash_%1").arg(projectName) - : QString("flash_%1_and_bootloader").arg(projectName); + const QString targetName = "flash_" + projectName; return {"--build", ".", "--target", targetName}; }