Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	src/plugins/android/androidextralibrarylistmodel.cpp

Change-Id: Ica69c24e83deff819e640dcb4c2682a554d8a2d2

1 files changed, 0 insertions, 24 deletions

diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index 87863964fcd..7586daf92c0 100644
--- a/src/plugins/mcusupport/mcusupportsdk.cpp
+++ b/src/plugins/mcusupport/mcusupportsdk.cpp
@@ -149,19 +149,6 @@ static McuPackage *createRGLPackage()
     return result;
 }
 
-static McuPackage *createStm32CubeFwF7SdkPackage()
-{
-    auto result = new McuPackage(
-                McuPackage::tr("STM32Cube SDK"),
-                "%{Env:STM32Cube_FW_F7_SDK_PATH}",
-                "Drivers/STM32F7xx_HAL_Driver",
-                "Stm32CubeFwF7Sdk");
-    result->setDownloadUrl(
-                "https://www.st.com/content/st_com/en/products/embedded-software/mcus-embedded-software/stm32-embedded-software/stm32cube-mcu-packages/stm32cubef7.html");
-    result->setEnvironmentVariableName("STM32Cube_FW_F7_SDK_PATH");
-    return result;
-}
-
 static McuPackage *createStm32CubeProgrammerPackage()
 {
 
@@ -185,17 +172,6 @@ static McuPackage *createStm32CubeProgrammerPackage()
     return result;
 }
 
-static McuPackage *createEvkbImxrt1050SdkPackage()
-{
-    auto result = new McuPackage(
-                McuPackage::tr("NXP i.MXRT SDK"),
-                "%{Env:EVKB_IMXRT1050_SDK_PATH}", // TODO: Try to not use 1050 specifics
-                "EVKB-IMXRT1050_manifest_v3_5.xml",
-                "EvkbImxrt1050Sdk");
-    result->setDownloadUrl("https://mcuxpresso.nxp.com/en/welcome");
-    return result;
-}
-
 static McuPackage *createMcuXpressoIdePackage()
 {
     const char envVar[] = "MCUXpressoIDE_PATH";