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
2525ff3c
Commit
2525ff3c
authored
Jan 06, 2011
by
hjk
Browse files
debugger: try to reduce s60devicerunconfiguration dependencies
parent
3b92aab2
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
2525ff3c
...
...
@@ -777,12 +777,13 @@ static inline QString symbolFileFromExecutable(const QString &executable)
}
// Create start parameters from run configuration
Debugger
::
DebuggerStartParameters
S60DeviceDebugRunControl
::
s60DebuggerStartParams
(
const
S60DeviceRunConfiguration
*
rc
)
static
Debugger
::
DebuggerStartParameters
s60DebuggerStartParams
(
const
S60DeviceRunConfiguration
*
rc
)
{
Debugger
::
DebuggerStartParameters
sp
;
QTC_ASSERT
(
rc
,
return
sp
);
const
S60DeployConfiguration
*
activeDeployConf
=
qobject_cast
<
S60DeployConfiguration
*>
(
rc
->
qt4Target
()
->
activeDeployConfiguration
());
const
S60DeployConfiguration
*
activeDeployConf
=
qobject_cast
<
S60DeployConfiguration
*>
(
rc
->
qt4Target
()
->
activeDeployConfiguration
());
const
QString
debugFileName
=
QString
::
fromLatin1
(
"%1:
\\
sys
\\
bin
\\
%2.exe"
)
.
arg
(
activeDeployConf
->
installationDrive
()).
arg
(
rc
->
targetName
());
...
...
@@ -804,8 +805,7 @@ Debugger::DebuggerStartParameters S60DeviceDebugRunControl::s60DebuggerStartPara
S60DeviceDebugRunControl
::
S60DeviceDebugRunControl
(
S60DeviceRunConfiguration
*
rc
,
const
QString
&
)
:
Debugger
::
DebuggerRunControl
(
rc
,
Debugger
::
GdbEngineType
,
S60DeviceDebugRunControl
::
s60DebuggerStartParams
(
rc
))
Debugger
::
DebuggerRunControl
(
rc
,
Debugger
::
GdbEngineType
,
s60DebuggerStartParams
(
rc
))
{
if
(
startParameters
().
symbolFileName
.
isEmpty
())
{
const
QString
msg
=
tr
(
"Warning: Cannot locate the symbol file belonging to %1."
).
...
...
@@ -832,7 +832,3 @@ void S60DeviceDebugRunControl::start()
emit
appendMessage
(
this
,
tr
(
"Launching debugger..."
),
false
);
Debugger
::
DebuggerRunControl
::
start
();
}
S60DeviceDebugRunControl
::~
S60DeviceDebugRunControl
()
{
}
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View file @
2525ff3c
...
...
@@ -203,11 +203,7 @@ class S60DeviceDebugRunControl : public Debugger::DebuggerRunControl
public:
explicit
S60DeviceDebugRunControl
(
S60DeviceRunConfiguration
*
runConfiguration
,
const
QString
&
mode
);
virtual
~
S60DeviceDebugRunControl
();
virtual
void
start
();
private:
static
Debugger
::
DebuggerStartParameters
s60DebuggerStartParams
(
const
S60DeviceRunConfiguration
*
rc
);
};
}
// namespace Internal
...
...
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