Skip to content
GitLab
Menu
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
91a6eee3
Commit
91a6eee3
authored
Dec 15, 2010
by
hjk
Browse files
debugger: move sanity check from DebuggerRunControl::start to Factory::create
parent
5e72be24
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerrunner.cpp
View file @
91a6eee3
...
...
@@ -455,21 +455,6 @@ bool DebuggerRunControl::checkDebugConfiguration(int toolChain,
void
DebuggerRunControl
::
start
()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
const
DebuggerStartParameters
&
sp
=
d
->
m_engine
->
startParameters
();
QString
errorMessage
;
QString
settingsCategory
;
QString
settingsPage
;
if
(
!
checkDebugConfiguration
(
sp
.
toolChainType
,
&
errorMessage
,
&
settingsCategory
,
&
settingsPage
))
{
emit
appendMessage
(
this
,
errorMessage
,
true
);
emit
finished
();
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
tr
(
"Debugger"
),
errorMessage
,
QString
(),
settingsCategory
,
settingsPage
);
return
;
}
debuggerCore
()
->
runControlStarted
(
d
->
m_engine
);
// We might get a synchronous startFailed() notification on Windows,
...
...
@@ -679,6 +664,18 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget
DebuggerRunControl
*
DebuggerRunControlFactory
::
create
(
const
DebuggerStartParameters
&
sp
,
RunConfiguration
*
runConfiguration
)
{
QString
errorMessage
;
QString
settingsCategory
;
QString
settingsPage
;
if
(
!
DebuggerRunControl
::
checkDebugConfiguration
(
sp
.
toolChainType
,
&
errorMessage
,
&
settingsCategory
,
&
settingsPage
))
{
//emit appendMessage(this, errorMessage, true);
Core
::
ICore
::
instance
()
->
showWarningWithOptions
(
tr
(
"Debugger"
),
errorMessage
,
QString
(),
settingsCategory
,
settingsPage
);
return
0
;
}
DebuggerRunControl
*
runControl
=
new
DebuggerRunControl
(
runConfiguration
,
m_enabledEngines
,
sp
);
if
(
runControl
->
d
->
m_engine
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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