Commit 8139d43c authored by Kai Koehne's avatar Kai Koehne
Browse files

Fix qml engine lockup when debugging an app run in terminal



The default timeout for the timer is set to 0 for projects that have
the 'run in terminal' option checked in the run settings. Make sure
that this timeout is set to a reasonable number once the first connect
fails, before we retry.

Task-number: QTCREATORBUG-8931
Change-Id: Iaa8acb50d76f182ceda77f8e6923738ad79ff445
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: default avatarAurindam Jana <aurindam.jana@digia.com>
parent ca340c6b
......@@ -401,8 +401,10 @@ void QmlEngine::tryToConnect(quint16 port)
if (state() == EngineRunRequested) {
if (isSlaveEngine()) {
// Probably cpp is being debugged and hence we did not get the output yet.
if (!masterEngine()->isDying())
if (!masterEngine()->isDying()) {
m_noDebugOutputTimer.setInterval(4000);
m_noDebugOutputTimer.start();
}
else
appStartupFailed(tr("No application output received in time"));
} else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment