diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2013-03-12 16:10:00 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-03-14 11:52:50 +0100 |
| commit | 6a0488fd25bbc72e085dc11fb5fb2f95d60cc56b (patch) | |
| tree | 0ff8bd948aa2be541c54696f35d013452536a1f9 | |
| parent | fda503748d0ac21338e280ced1dca096d94f6899 (diff) | |
| download | qt-creator-6a0488fd25bbc72e085dc11fb5fb2f95d60cc56b.tar.gz | |
Fix loading of debugger in a Kit
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>
| -rw-r--r-- | src/plugins/debugger/debuggerkitinformation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerkitinformation.cpp b/src/plugins/debugger/debuggerkitinformation.cpp index 522d9570cf..da6a77b67d 100644 --- a/src/plugins/debugger/debuggerkitinformation.cpp +++ b/src/plugins/debugger/debuggerkitinformation.cpp @@ -203,7 +203,8 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons void DebuggerKitInformation::setup(Kit *k) { 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 |