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
d992b223
Commit
d992b223
authored
Nov 16, 2010
by
Christiaan Janssen
Browse files
QmlDebugger: Fixing QmlCppEngine for failed setup due to timed out connection
parent
da840003
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/qml/qmlcppengine.cpp
View file @
d992b223
...
...
@@ -83,10 +83,8 @@ QmlCppEngine::QmlCppEngine(const DebuggerStartParameters &sp)
QmlCppEngine
::~
QmlCppEngine
()
{
if
(
d
->
m_qmlEngine
)
delete
d
->
m_qmlEngine
;
if
(
d
->
m_cppEngine
)
delete
d
->
m_cppEngine
;
delete
d
->
m_qmlEngine
;
delete
d
->
m_cppEngine
;
}
void
QmlCppEngine
::
editorChanged
(
Core
::
IEditor
*
editor
)
...
...
@@ -483,7 +481,7 @@ void QmlCppEngine::shutdownInferior()
{
if
(
!
checkErrorState
(
InferiorShutdownFailed
))
{
if
(
d
->
m_cppEngine
->
state
()
==
InferiorStopOk
)
{
d
->
m_cppEngine
->
shutdownInferio
r
();
d
->
m_cppEngine
->
quitDebugge
r
();
}
else
{
notifyInferiorShutdownOk
();
}
...
...
@@ -499,13 +497,19 @@ void QmlCppEngine::initEngineShutdown()
d
->
m_cppEngine
->
quitDebugger
();
}
else
if
(
state
()
==
EngineSetupRequested
)
{
if
(
!
checkErrorState
(
EngineSetupFailed
))
{
if
(
!
runControl
()
||
d
->
m_errorState
==
EngineSetupFailed
)
{
notifyEngineSetupFailed
();
}
else
{
notifyEngineSetupOk
();
}
}
else
if
(
state
()
==
InferiorStopRequested
)
{
checkErrorState
(
InferiorStopFailed
);
}
else
{
}
else
if
(
state
()
==
InferiorShutdownRequested
&&
!
checkErrorState
(
InferiorShutdownFailed
))
{
notifyInferiorShutdownOk
();
}
else
if
(
state
()
!=
DebuggerFinished
)
{
quitDebugger
();
}
}
...
...
@@ -518,11 +522,6 @@ void QmlCppEngine::shutdownEngine()
}
}
void
QmlCppEngine
::
setupSlaveEngineOnTimer
()
{
QTimer
::
singleShot
(
0
,
this
,
SLOT
(
setupSlaveEngine
()));
}
void
QmlCppEngine
::
setupSlaveEngine
()
{
if
(
d
->
m_qmlEngine
->
state
()
==
DebuggerNotReady
)
...
...
@@ -620,6 +619,13 @@ void QmlCppEngine::engineStateChanged(const DebuggerState &newState)
}
break
;
case
EngineShutdownRequested
:
// we have to abort the setup before the sub-engines die
// because we depend on an active runcontrol that will be shut down by the dying engine
if
(
state
()
==
EngineSetupRequested
)
notifyEngineSetupFailed
();
break
;
case
DebuggerFinished
:
initEngineShutdown
();
break
;
...
...
src/plugins/debugger/qml/qmlcppengine.h
View file @
d992b223
...
...
@@ -107,7 +107,6 @@ private slots:
void
editorChanged
(
Core
::
IEditor
*
editor
);
private:
void
setupSlaveEngineOnTimer
();
void
initEngineShutdown
();
bool
checkErrorState
(
const
DebuggerState
stateToCheck
);
void
engineStateChanged
(
const
DebuggerState
&
newState
);
...
...
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