diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-04-10 15:03:02 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-04-10 16:28:58 +0200 |
| commit | 8139d43c294ef68460c6749a0d1aa5ad0ba37910 (patch) | |
| tree | 3a2912c1fec36ce4a017ef1336e34fc6e0b23047 /src/plugins | |
| parent | ca340c6b4ec4b98e37b21a7f620e59c6b3b24b9e (diff) | |
| download | qt-creator-8139d43c294ef68460c6749a0d1aa5ad0ba37910.tar.gz | |
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: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 1c5690c700..822a835a36 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -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 { |