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

Fix loading of debugger in a Kit

Browse Source 
Loaded debuggers from a generated profiles.xml
where overwritten by autodetected values. So
check if debugger is valid before taking
autodetected values.

Change-Id: I768821950cc507c8b772ea1894af6b653e7604d1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Andreas Holzammer
2013-03-12 16:10:00 +01:00
committed by Tobias Hunger
parent fda503748d
commit 6a0488fd25
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/debuggerkitinformation.cpp
View File

@@ -203,7 +203,8 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons
void DebuggerKitInformation::setup(Kit *k) void DebuggerKitInformation::setup(Kit *k)
{ {
QTC_ASSERT(ToolChainManager::instance()->isLoaded(), return); QTC_ASSERT(ToolChainManager::instance()->isLoaded(), return);
setDebuggerItem(k, autoDetectItem(k)); if (!isValidDebugger(k))
setDebuggerItem(k, autoDetectItem(k));
} }
// Check the configuration errors and return a flag mask. Provide a quick check and // Check the configuration errors and return a flag mask. Provide a quick check and