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

Symbian: Fix Toolchain to remember its debugger.

Browse Source
This commit is contained in:
Friedemann Kleint
2011-02-24 15:35:22 +01:00
parent c82613ef93
commit 93b3c8bbd2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
View File

@@ -102,7 +102,8 @@ RvctToolChain::RvctToolChain(const RvctToolChain &tc) :
ToolChain(tc), ToolChain(tc),
m_compilerPath(tc.m_compilerPath), m_compilerPath(tc.m_compilerPath),
m_environmentChanges(tc.m_environmentChanges), 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) RvctToolChain::RvctVersion RvctToolChain::version(const QString &rvctPath)
@@ -378,6 +379,7 @@ void RvctToolChainConfigWidget::apply()
tc->setCompilerPath(m_ui->compilerPath->path()); tc->setCompilerPath(m_ui->compilerPath->path());
tc->setArmVersion(static_cast<RvctToolChain::ArmVersion>(m_ui->versionComboBox->currentIndex())); tc->setArmVersion(static_cast<RvctToolChain::ArmVersion>(m_ui->versionComboBox->currentIndex()));
tc->setEnvironmentChanges(changes); tc->setEnvironmentChanges(changes);
tc->setDebuggerCommand(debuggerCommand());
m_model->setUserChanges(changes); m_model->setUserChanges(changes);
} }
@@ -391,6 +393,7 @@ void RvctToolChainConfigWidget::setFromToolChain()
m_ui->compilerPath->setPath(tc->compilerPath()); m_ui->compilerPath->setPath(tc->compilerPath());
m_ui->versionComboBox->setCurrentIndex(static_cast<int>(tc->armVersion())); m_ui->versionComboBox->setCurrentIndex(static_cast<int>(tc->armVersion()));
setDebuggerCommand(tc->debuggerCommand());
} }
bool RvctToolChainConfigWidget::isDirty() const bool RvctToolChainConfigWidget::isDirty() const
@@ -400,7 +403,8 @@ bool RvctToolChainConfigWidget::isDirty() const
return tc->compilerPath() != m_ui->compilerPath->path() return tc->compilerPath() != m_ui->compilerPath->path()
|| tc->armVersion() != static_cast<RvctToolChain::ArmVersion>(m_ui->versionComboBox->currentIndex()) || 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 QList<Utils::EnvironmentItem> RvctToolChainConfigWidget::environmentChanges() const