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

Debugger: Avoid duplication of SDK debuggers

Browse Source 
Task-number: QTCREATORBUG-12888
Change-Id: I732f1bfe44dc47d0c96570649f3bf8c0e3f40dda
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-08-24 08:36:07 +03:00
committed by Orgad Shaneh
parent 72c60097c3
commit 5b5a7d1dea
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/debuggeritemmanager.cpp
View File

@@ -378,18 +378,15 @@ void DebuggerItemManager::saveDebuggers()
QVariant DebuggerItemManager::registerDebugger(const DebuggerItem &item) QVariant DebuggerItemManager::registerDebugger(const DebuggerItem &item)
{ {
// Force addition when Id is set. // Try re-using existing item first.
if (item.id().isValid())
return addDebugger(item);
// Otherwise, try re-using existing item first.
foreach (const DebuggerItem &d, m_debuggers) { foreach (const DebuggerItem &d, m_debuggers) {
if (d.command() == item.command() if (d.command() == item.command()
&& d.isAutoDetected() == item.isAutoDetected() && d.isAutoDetected() == item.isAutoDetected()
&& d.engineType() == item.engineType() && d.engineType() == item.engineType()
&& d.displayName() == item.displayName() && d.displayName() == item.displayName()
&& d.abis() == item.abis()) && d.abis() == item.abis()) {
return d.id(); return d.id();
}
} }
// Nothing suitable. Create a new id and add the item. // Nothing suitable. Create a new id and add the item.