From 93b3c8bbd2f8f5e48f5cc3a2da781d424ff9fbd0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 24 Feb 2011 15:35:22 +0100
Subject: [PATCH] Symbian: Fix Toolchain to remember its debugger.
---
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index 72de9b6205a..678bc074721 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -102,7 +102,8 @@ RvctToolChain::RvctToolChain(const RvctToolChain &tc) :
ToolChain(tc),
m_compilerPath(tc.m_compilerPath),
m_environmentChanges(tc.m_environmentChanges),
- m_armVersion(tc.m_armVersion)
+ m_armVersion(tc.m_armVersion),
+ m_debuggerCommand(tc.debuggerCommand())
{ }
RvctToolChain::RvctVersion RvctToolChain::version(const QString &rvctPath)
@@ -378,6 +379,7 @@ void RvctToolChainConfigWidget::apply()
tc->setCompilerPath(m_ui->compilerPath->path());
tc->setArmVersion(static_cast<RvctToolChain::ArmVersion>(m_ui->versionComboBox->currentIndex()));
tc->setEnvironmentChanges(changes);
+ tc->setDebuggerCommand(debuggerCommand());
m_model->setUserChanges(changes);
}
@@ -391,6 +393,7 @@ void RvctToolChainConfigWidget::setFromToolChain()
m_ui->compilerPath->setPath(tc->compilerPath());
m_ui->versionComboBox->setCurrentIndex(static_cast<int>(tc->armVersion()));
+ setDebuggerCommand(tc->debuggerCommand());
}
bool RvctToolChainConfigWidget::isDirty() const
@@ -400,7 +403,8 @@ bool RvctToolChainConfigWidget::isDirty() const
return tc->compilerPath() != m_ui->compilerPath->path()
|| tc->armVersion() != static_cast<RvctToolChain::ArmVersion>(m_ui->versionComboBox->currentIndex())
- || tc->environmentChanges() != environmentChanges();
+ || tc->environmentChanges() != environmentChanges()
+ || tc->debuggerCommand() != debuggerCommand();
}
QList<Utils::EnvironmentItem> RvctToolChainConfigWidget::environmentChanges() const
--
GitLab