aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2015-11-30 20:01:06 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2015-12-15 14:54:31 +0000
commit18c4295e25503ae637a715858de5c94a3d105a92 (patch)
tree17efb5e441c5f67ed6c6f50976ce5c54eb7df645 /src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
parent73be0b70e52ab4e10d91ff6bcd6320138deb0b7a (diff)
V4 Debugger: use engineAdded() instead of engineAboutToBeAdded()
It does not make a difference in functionality, but after engineAdded() the server won't wait on a mutex anymore. Before this change, if you managed to send a message to the V4 debugger after the server had called aboutToBeAdded(), but before it had stopped waiting, you could produce a deadlock by scheduling an event for the GUI thread that was never delivered. Change-Id: I3a7fb2e46d67b7cc03733154ea61f2bf35f8ea24 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp')
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
index 505617b8f9..dea1fae779 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
@@ -651,7 +651,7 @@ QV4DebugServiceImpl::~QV4DebugServiceImpl()
qDeleteAll(handlers);
}
-void QV4DebugServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
+void QV4DebugServiceImpl::engineAdded(QJSEngine *engine)
{
QMutexLocker lock(&m_configMutex);
if (engine) {
@@ -667,7 +667,7 @@ void QV4DebugServiceImpl::engineAboutToBeAdded(QJSEngine *engine)
}
}
}
- QQmlConfigurableDebugService<QV4DebugService>::engineAboutToBeAdded(engine);
+ QQmlConfigurableDebugService<QV4DebugService>::engineAdded(engine);
}
void QV4DebugServiceImpl::engineAboutToBeRemoved(QJSEngine *engine)