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
2a4db8a7
Commit
2a4db8a7
authored
Apr 23, 2010
by
hjk
Browse files
debugger: make script debugger work again
parent
58adeb84
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggermanager.cpp
View file @
2a4db8a7
...
...
@@ -1060,10 +1060,9 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
if
(
d
->
m_state
!=
DebuggerNotReady
)
return
;
d
->
m_startParameters
=
sp
;
d
->
m_inferiorPid
=
d
->
m_startParameters
->
attachPID
>
0
?
d
->
m_startParameters
->
attachPID
:
0
;
d
->
m_inferiorPid
=
sp
->
attachPID
>
0
?
sp
->
attachPID
:
0
;
const
QString
toolChainName
=
ProjectExplorer
::
ToolChain
::
toolChainName
(
ProjectExplorer
::
ToolChain
::
ToolChainType
(
d
->
m_startParameter
s
->
toolChainType
));
ProjectExplorer
::
ToolChain
::
ToolChainType
(
s
p
->
toolChainType
));
d
->
m_plugin
->
activateDebugMode
();
showDebuggerOutput
(
LogStatus
,
...
...
@@ -1074,14 +1073,18 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
QString
settingsIdHint
;
// Figure out engine: toolchain, executable, attach or default
const
DebuggerStartMode
startMode
=
d
->
m_startParameters
->
startMode
;
d
->
m_engine
=
debuggerEngineForToolChain
(
d
->
m_startParameters
->
toolChainType
);
const
DebuggerStartMode
startMode
=
sp
->
startMode
;
if
(
sp
->
executable
.
endsWith
(
_
(
".js"
)))
d
->
m_engine
=
scriptEngine
;
else
d
->
m_engine
=
debuggerEngineForToolChain
(
sp
->
toolChainType
);
if
(
d
->
m_engine
==
0
&&
startMode
!=
StartRemote
&&
!
d
->
m_startParameter
s
->
executable
.
isEmpty
())
&&
!
s
p
->
executable
.
isEmpty
())
d
->
m_engine
=
debuggerEngineForExecutable
(
d
->
m_startParameter
s
->
executable
,
&
errorMessage
,
&
settingsIdHint
);
s
p
->
executable
,
&
errorMessage
,
&
settingsIdHint
);
if
(
d
->
m_engine
==
0
)
d
->
m_engine
=
debuggerEngineForMode
(
startMode
,
&
errorMessage
);
...
...
@@ -1089,18 +1092,18 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
if
(
!
d
->
m_engine
)
{
emit
debuggingFinished
();
// Create Message box with possibility to go to settings
const
QString
msg
=
tr
(
"Cannot debug '%1' (tool chain: '%2'): %3"
)
.
arg
(
d
->
m_startParameter
s
->
executable
,
toolChainName
,
errorMessage
);
const
QString
msg
=
tr
(
"Cannot debug '%1' (tool chain: '%2'): %3"
)
.
arg
(
s
p
->
executable
,
toolChainName
,
errorMessage
);
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
tr
(
"Warning"
),
msg
,
QString
(),
QLatin1String
(
DEBUGGER_SETTINGS_CATEGORY
),
settingsIdHint
);
return
;
}
STATE_DEBUG
(
d
->
m_startParameter
s
->
executable
<<
d
->
m_engine
);
STATE_DEBUG
(
s
p
->
executable
<<
d
->
m_engine
);
setBusyCursor
(
false
);
setState
(
EngineStarting
);
connect
(
d
->
m_engine
,
SIGNAL
(
startFailed
()),
this
,
SLOT
(
startFailed
()));
d
->
m_engine
->
startDebugger
(
d
->
m_startParameter
s
);
d
->
m_engine
->
startDebugger
(
s
p
);
const
unsigned
engineCapabilities
=
d
->
m_engine
->
debuggerCapabilities
();
theDebuggerAction
(
OperateByInstruction
)
...
...
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