Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
93b3c8bb
Commit
93b3c8bb
authored
Feb 24, 2011
by
Friedemann Kleint
Browse files
Symbian: Fix Toolchain to remember its debugger.
parent
c82613ef
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
View file @
93b3c8bb
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment