Merge remote-tracking branch 'origin/4.13' into master

Change-Id: I8a2dca29595a0770f4162786b15a145f3f4133af
2020-09-04 16:11:12 +03:00
parent b7573a7400 913dc6473d
commit e504d96934
49 changed files with 1254 additions and 128 deletions
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -343,8 +343,8 @@ void CMakeToolItemModel::removeCMakeTool(const Utils::Id &id)
    CMakeToolTreeItem *treeItem = cmakeToolItem(id);
    QTC_ASSERT(treeItem, return);

-    destroyItem(treeItem);
    m_removedItems.append(id);
+    destroyItem(treeItem);
 }

 void CMakeToolItemModel::apply()