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
3938cd67
Commit
3938cd67
authored
Oct 08, 2010
by
Christiaan Janssen
Browse files
DebuggerEngine: fixed race condition at qml engine startup
Reviewed by: hjk
parent
63f2b87e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/qml/qmlcppengine.cpp
View file @
3938cd67
...
...
@@ -449,7 +449,7 @@ void QmlCppEngine::finishDebugger()
void
QmlCppEngine
::
setupSlaveEngineOnTimer
()
{
QTimer
::
singleShot
(
ConnectionWaitTimeMs
,
this
,
SLOT
(
setupSlaveEngine
()));
QTimer
::
singleShot
(
0
,
this
,
SLOT
(
setupSlaveEngine
()));
}
void
QmlCppEngine
::
setupSlaveEngine
()
...
...
src/plugins/debugger/qml/qmlengine.cpp
View file @
3938cd67
...
...
@@ -260,9 +260,13 @@ void QmlEngine::shutdownInferiorAsSlave()
if
(
state
()
==
InferiorRunOk
)
{
setState
(
InferiorStopRequested
);
setState
(
InferiorStopOk
);
setState
(
InferiorShutdownRequested
);
setState
(
InferiorShutdownOk
);
}
else
{
// force
setState
(
InferiorShutdownRequested
,
true
);
setState
(
InferiorShutdownOk
);
}
setState
(
InferiorShutdownRequested
);
setState
(
InferiorShutdownOk
);
}
void
QmlEngine
::
shutdownEngineAsSlave
()
...
...
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