Merge "Merge remote-tracking branch 'origin/4.12'"

4 files changed, 9 insertions, 29 deletions

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index f6ff454d23..4ea7fc6bd8 100644
--- a/src/plugins/android/androidconfigurations.cpp
+++ b/src/plugins/android/androidconfigurations.cpp
@@ -616,8 +616,9 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
     if (adbDevs.empty())
         return devices;
 
-    while (adbDevs.first().startsWith("* daemon"))
-        adbDevs.removeFirst(); // remove the daemon logs
+    for (const QString line : adbDevs) // remove the daemon logs
+        if (line.startsWith("* daemon"))
+            adbDevs.removeOne(line);
     adbDevs.removeFirst(); // remove "List of devices attached" header line
 
     // workaround for '????????????' serial numbers:
diff --git a/src/plugins/android/androidextralibrarylistmodel.cpp b/src/plugins/android/androidextralibrarylistmodel.cpp
index 1bbcbc1747..7ade7405a8 100644
--- a/src/plugins/android/androidextralibrarylistmodel.cpp
+++ b/src/plugins/android/androidextralibrarylistmodel.cpp
@@ -90,7 +90,8 @@ void AndroidExtraLibraryListModel::updateModel()
 {
     const QString buildKey = m_buildSystem->target()->activeBuildKey();
     const ProjectNode *node = m_buildSystem->target()->project()->findNodeForBuildKey(buildKey);
-    QTC_ASSERT(node, return);
+    if (!node)
+        return;
 
     if (node->parseInProgress()) {
         emit enabledChanged(false);
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp
index 22c40dfef9..fa88a4987f 100644
--- a/src/plugins/android/androidtoolmanager.cpp
+++ b/src/plugins/android/androidtoolmanager.cpp
@@ -206,8 +206,10 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil
     if (avds.empty())
         return devices;
 
-    while (avds.first().startsWith(QLatin1String("* daemon")))
-        avds.removeFirst(); // remove the daemon logs
+    for (const QString line : avds) // remove the daemon logs
+        if (line.startsWith("* daemon"))
+            avds.removeOne(line);
+
     avds.removeFirst(); // remove "List of devices attached" header line
 
     bool nextLineIsTargetLine = false;
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp
index 87863964fc..7586daf92c 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";