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

Fix broken import of debugger on upgading to profiles

Browse Source 
Change-Id: Ie11b8f1efaf4d6b5c6b0f2838bcf7ac36ac434ba
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-06-26 14:53:30 +02:00
parent 313419b58b
commit a285e26d76
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -2467,7 +2467,11 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
// Debugger + mkspec
if (m_toolChainExtras.contains(origTcId)) {
tmp->setValue(Core::Id("Debugger.Information"), m_toolChainExtras.value(origTcId).m_debugger);
Utils::Environment env = Utils::Environment::systemEnvironment();
QString debugger = m_toolChainExtras.value(origTcId).m_debugger;
if (!debugger.isEmpty() && !QFileInfo(debugger).isAbsolute())
debugger = env.searchInPath(debugger);
tmp->setValue(Core::Id("Debugger.Information"), debugger);
tmp->setValue(Core::Id("QtPM4.mkSpecInformation"), m_toolChainExtras.value(origTcId).m_mkspec);
}