feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Toolchainsoptions page: Treat adding/removing correctly

Browse Source 
Reviewed-By: hunger
This commit is contained in:
dt
2011-02-23 16:22:41 +01:00
parent 5e2171bd29
commit 5d0c1a419c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/toolchainoptionspage.cpp
View File

@@ -307,7 +307,6 @@ void ToolChainModel::apply()
foreach (ToolChainNode *n, nodes) { foreach (ToolChainNode *n, nodes) {
ToolChainManager::instance()->registerToolChain(n->toolChain); ToolChainManager::instance()->registerToolChain(n->toolChain);
} }
Q_ASSERT(m_toAddList.isEmpty());
} }
void ToolChainModel::discard() void ToolChainModel::discard()
@@ -339,6 +338,7 @@ void ToolChainModel::discard()
n->widget->discard(); n->widget->discard();
n->changed = false; n->changed = false;
} }
reset();
} }
void ToolChainModel::markForRemoval(ToolChain *tc) void ToolChainModel::markForRemoval(ToolChain *tc)
@@ -351,9 +351,15 @@ void ToolChainModel::markForRemoval(ToolChain *tc)
} }
} }
if (node) { if (node) {
m_toRemoveList.append(node);
emit beginRemoveRows(index(m_manualRoot), m_manualRoot->childNodes.indexOf(node), m_manualRoot->childNodes.indexOf(node)); emit beginRemoveRows(index(m_manualRoot), m_manualRoot->childNodes.indexOf(node), m_manualRoot->childNodes.indexOf(node));
m_manualRoot->childNodes.removeOne(node); m_manualRoot->childNodes.removeOne(node);
if (m_toAddList.contains(node)) {
delete node->toolChain;
node->toolChain = 0;
m_toAddList.removeOne(node);
} else {
m_toRemoveList.append(node);
}
emit endRemoveRows(); emit endRemoveRows();
} }
} }